Upstream sync

2020-07-14 14:10:30 +02:00
parent 35303cb570
commit 4c49a5db03
28 changed files with 407 additions and 29 deletions
--- a/app/policies/contract_template_policy.rb
+++ b/app/policies/contract_template_policy.rb
@@ -3,8 +3,10 @@ class ContractTemplatePolicy < ApplicationPolicy
    def resolve
      if user.account_manager?
        scope.left_outer_joins(:project).where(projects: {account: user.account})
-      else
+      elsif user.manager?
        scope.left_outer_joins(project: :project_memberships).where(project_memberships: { user_id: user.id })
+      else
+        scope.public_template.left_outer_joins(project: :project_memberships).where(project_memberships: { user_id: user.id })
      end
    end
  end