Adapt policy classes to changes in base class

openSUSE · Dec 12, 2018 · c852d9e · c852d9e
1 parent 66c123d
commit c852d9e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/src/api/app/policies/staging/staging_project_policy.rb b/src/api/app/policies/staging/staging_project_policy.rb
@@ -1,23 +1,21 @@
 class Staging::StagingProjectPolicy < ApplicationPolicy
   def initialize(user, record)
-    raise Pundit::NotAuthorizedError, 'staging workflow does not exist' unless record
-    @user = user
-    @record = record
+    super(user, record, user_optional: true)
   end
 
   def create?
-    ProjectPolicy.new(@user, @record).create?
+    ProjectPolicy.new(user, record).create?
   end
 
   def update?
-    ProjectPolicy.new(@user, @record).update?
+    ProjectPolicy.new(user, record).update?
   end
 
   def edit?
     update?
   end
 
   def destroy?
-    ProjectPolicy.new(@user, @record).destroy?
+    ProjectPolicy.new(user, record).destroy?
   end
 end
diff --git a/src/api/app/policies/staging/workflow_policy.rb b/src/api/app/policies/staging/workflow_policy.rb
@@ -1,16 +1,14 @@
 class Staging::WorkflowPolicy < ApplicationPolicy
   def initialize(user, record)
-    raise Pundit::NotAuthorizedError, 'staging workflow does not exist' unless record
-    @user = user
-    @record = record
+    super(user, record, user_optional: true)
   end
 
   def create?
-    ProjectPolicy.new(@user, @record.project).update?
+    ProjectPolicy.new(user, record.project).update?
   end
 
   def update?
-    ProjectPolicy.new(@user, @record.project).update?
+    ProjectPolicy.new(user, record.project).update?
   end
 
   def assign_managers_group?
@@ -22,6 +20,6 @@ def edit?
   end
 
   def destroy?
-    ProjectPolicy.new(@user, @record.project).destroy?
+    ProjectPolicy.new(user, record.project).destroy?
   end
 end