Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve coverage of policy scopes in controllers #1101

Open
wants to merge 1 commit into
base: jc/change_support_console_views_to_use_multi-org
Choose a base branch
from
+11 −10
Open

Improve coverage of policy scopes in controllers #1101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions app/controllers/placements/organisations/users_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ class Placements::Organisations::UsersController < Placements::ApplicationContro
before_action :authorize_user, only: %i[remove destroy]

def index
scope = policy_scope(users)
@users = scope.order_by_full_name
@users = users.order_by_full_name
end

def show; end
Expand All @@ -26,7 +25,7 @@ def set_user
end

def users
@users = @organisation.users
@users = policy_scope(@organisation.users)
end

def set_user_membership
Expand Down
3 changes: 1 addition & 2 deletions app/controllers/placements/providers/partner_schools/placements_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
class Placements::Providers::PartnerSchools::PlacementsController < Placements::ApplicationController
skip_after_action :verify_policy_scoped, only: %i[index]
before_action :set_provider, only: %i[index show]
before_action :set_partner_school, only: %i[index show]

Expand All @@ -21,6 +20,6 @@ def set_partner_school
end

def placements_scope
@partner_school.placements
policy_scope(@partner_school.placements, policy_scope_class: Placements::Provider::PlacementPolicy::Scope)
end
end
2 changes: 1 addition & 1 deletion app/controllers/placements/providers/partner_schools_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def source_organisation
end

def set_decorated_partner_organisation
@partner_school = @provider.partner_schools.find(params.require(:id)).decorate
@partner_school = policy_scope(@provider.partner_schools).find(params.require(:id)).decorate
end

def set_partnership
Expand Down
5 changes: 4 additions & 1 deletion app/controllers/placements/providers/placements_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ def index
end

def show
@placement = Placement.find(params[:id]).decorate
@placement = policy_scope(
Placement.all,
policy_scope_class: Placements::Provider::PlacementPolicy::Scope,
).find(params.require(:id)).decorate
@school = @placement.school
end

Expand Down
2 changes: 1 addition & 1 deletion app/controllers/placements/schools/mentors_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def destroy
private

def set_mentor
@mentor = @school.mentors.find(params.require(:id))
@mentor = policy_scope(@school.mentors).find(params.require(:id))
end

def set_mentor_membership
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/placements/schools/partner_providers_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def source_organisation
end

def set_decorated_partner_organisation
@partner_provider = @school.partner_providers.find(params.require(:id)).decorate
@partner_provider = policy_scope(@school.partner_providers).find(params.require(:id)).decorate
end

def set_partnership
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/placements/schools/placements_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def academic_year_scope
end

def set_placement
@placement = @school.placements.find(params.require(:id))
@placement = policy_scope(@school.placements).find(params.require(:id))
end

def set_decorated_placement
Expand Down