app/controllers/scrivito/objs_controller.rb in scrivito_sdk-0.60.0 vs app/controllers/scrivito/objs_controller.rb in scrivito_sdk-0.65.0.rc1

@@ -31,11 +31,11 @@
       in_selected_workspace { render }
     end
 
     def create
       params_parser = ObjCreateParamsParser.new(request.host, request.port)
-      @obj = Obj.create(params_parser.parse(params[:obj]))
+      @obj = Obj.create(params_parser.parse(params[:obj]), scrivito_user: scrivito_user)
       render :obj
     rescue ObjClassNotFound
       head :not_found
     end
 
@@ -43,12 +43,15 @@
       assert_dialog_layout
       render current_obj.details_view_path, layout: 'scrivito_dialog', formats: :html
     end
 
     def update
-      params_parser = ObjUpdateParamsParser.new(current_obj, request.host, request.port)
+      params_parser = ObjUpdateParamsParser.new(request.host, request.port,
+        current_obj: current_obj, scrivito_user: scrivito_user)
       current_obj.update(params_parser.parse(params[:obj]))
+    rescue ObjClassNotFound
+      head :not_found
     end
 
     def destroy
       in_selected_workspace do
         @redirect_to = scrivito_path(current_obj.parent || Obj.homepage)
@@ -77,9 +80,14 @@
     end
 
     def restore_widget
       in_selected_workspace { current_obj.restore_widget(params[:widget_id]) }
       render_empty_json
+    end
+
+    def conflict_warnings
+      @workspaces = selected_workspace.conflict_warning_for(params[:id])
+      render :workspaces
     end
 
     def mark_resolved
       in_selected_workspace { current_obj.mark_resolved }
       render_empty_json