diff --git a/app/policies/plan_policy.rb b/app/policies/plan_policy.rb index 22fd1f9..b3630bc 100644 --- a/app/policies/plan_policy.rb +++ b/app/policies/plan_policy.rb @@ -3,7 +3,7 @@ attr_reader :plan def initialize(user, plan) - raise Pundit::NotAuthorizedError, "must be logged in" unless user || plan.publicly_visible? + raise Pundit::NotAuthorizedError, "must be logged in" unless user @user = user @plan = plan end @@ -43,7 +43,7 @@ def duplicate? @plan.editable_by?(@user.id) && Role.find_by(user_id: @user.id, plan_id: @plan.id).active end - + def visibility? @plan.administerable_by?(@user.id) && Role.find_by(user_id: @user.id, plan_id: @plan.id).active end @@ -52,10 +52,6 @@ @plan.administerable_by?(@user.id)&& Role.find_by(user_id: @user.id, plan_id: @plan.id).active end - def public_export? - @plan.publicly_visible? - end - def answer? @plan.readable_by?(@user.id) && Role.find_by(user_id: @user.id, plan_id: @plan.id).active end diff --git a/app/policies/template_policy.rb b/app/policies/template_policy.rb index 6d524bc..feb94b6 100644 --- a/app/policies/template_policy.rb +++ b/app/policies/template_policy.rb @@ -2,7 +2,7 @@ attr_reader :user, :template def initialize(user, template) - raise Pundit::NotAuthorizedError, "must be logged in" unless user || template.is_default || template.org.funder? + raise Pundit::NotAuthorizedError, "must be logged in" unless user @user = user @template = template end @@ -17,22 +17,18 @@ user.can_modify_templates? end - def admin_export? - - end - def admin_template? user.can_modify_templates? && (template.org_id == user.org_id) end - + def admin_customize? user.can_modify_templates? end - + def admin_publish? user.can_modify_templates? && (template.org_id == user.org_id) end - + def admin_unpublish? user.can_modify_templates? && (template.org_id == user.org_id) end