app/controllers/scrivito/objs_controller.rb in scrivito_sdk-1.6.1 vs app/controllers/scrivito/objs_controller.rb in scrivito_sdk-1.7.0.rc1

- old
+ new

@@ -1,12 +1,8 @@ module Scrivito class ObjsController < WebserviceController - around_action :require_selected_workspace_write_authorization, only: [ - :restore, - ] - - before_filter :require_identical_selected_and_visible_workspace, only: [ + before_action :require_identical_selected_and_visible_workspace, only: [ :page_class_selection, :widget_class_selection, ] def show @@ -20,15 +16,10 @@ def details assert_dialog_layout render current_obj.details_view_path, layout: 'scrivito_dialog', formats: :html end - def restore - in_selected_workspace { Obj.restore(params[:id]) } - render_empty_json - end - def transfer_modifications in_selected_workspace do begin obj = Obj.find_including_deleted(params[:id]) workspace = Workspace.find(params[:workspace_id]) @@ -85,13 +76,9 @@ def require_identical_selected_and_visible_workspace if selected_workspace != editing_context.visible_workspace raise ScrivitoError, 'selected and visible workspace are not identical' end - end - - def require_selected_workspace_write_authorization(&block) - authorize_workspace_access(:write, selected_workspace, &block) end def in_selected_workspace(&block) selected_workspace.as_current(&block) end