workspaces_controller.rb in scrivito_sdk-1.9.0.rc1

- old
+ new

@@ -1,26 +1,11 @@
 module Scrivito
   class WorkspacesController < WebserviceController
-    def self.restrict_access_to(action_name, require_permission:)
-      around_action only: action_name do |_, block|
-        subject = params.key?(:id) ? current_workspace : :workspace
-        authorize_workspace_access(require_permission, subject, &block)
-      end
+    around_action only: [:check, :publish_approval] do |_, block|
+      authorize_workspace_access(:publish, current_workspace, &block)
     end
 
-    restrict_access_to :show,             require_permission: :read
-    restrict_access_to :check,            require_permission: :publish
-    restrict_access_to :publish_approval, require_permission: :publish
-
-    def index
-      @workspaces = Workspace.all.select(&method(:can_user_read_workspace?))
-      render :workspaces
-    end
-
-    def show
-    end
-
     def check
       assert_workspace_is_not_outdated unless current_workspace.auto_update?
       @check_result = publish_checker.call(params[:from].to_i)
     end
 
@@ -47,10 +32,9 @@
     end
 
     def current_workspace
       @current_workspace ||= Workspace.find(params[:id])
     end
-    helper_method :current_workspace
 
     def certificates_param
       assert_valid_certificates_param
       params[:certificates]
     end