Skip to content

Block supporting org editors from locking themselves out [WHIT - 3458] #11455

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

Open
GDSNewt wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −2
Open

Block supporting org editors from locking themselves out [WHIT - 3458] #11455

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
14 changes: 12 additions & 2 deletions app/controllers/admin/editions_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,17 @@ def edit
end

def update
@edition.assign_attributes(edition_params)
saved = ApplicationRecord.transaction do
Copy link
Copy Markdown
Contributor

@TonyGDS TonyGDS May 15, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DraftEditionUpdater has a method access_limit_excludes_current_user? could we not do something similar here with the input params rather than wrapping the action in a transaction? Reading the code it's unclear why we need to do it. If we call access_limit_excludes_current_user? before @edition.assign_attributes(edition_params) we wouldn't have to roll anything back.

@edition.assign_attributes(edition_params)

if updater.can_perform? && @edition.save_as(current_user)
if updater.can_perform? && @edition.save_as(current_user)
true
else
raise ActiveRecord::Rollback
end
end

if saved
updater.perform!

if @edition.link_check_report
Expand Down Expand Up @@ -409,6 +417,8 @@ def delete_absent_edition_organisations
end
if edition_params[:supporting_organisation_ids]
edition_params[:supporting_organisation_ids] = edition_params[:supporting_organisation_ids].reject(&:blank?)
elsif edition_params.key?(:lead_organisation_ids)
Copy link
Copy Markdown
Contributor

@TonyGDS TonyGDS May 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not clear reading the code why we are doing this. We could create a separate method to describe it e.g.

  if editions_form_cleared_supporting_orgs?
    edition_params[:supporting_organisation_ids] = []
  elsif edition_params[:supporting_organisation_ids]
    edition_params[:supporting_organisation_ids] = edition_params[:supporting_organisation_ids].reject(&:blank?)
  end

  def editions_form_cleared_supporting_orgs?
    edition_params.key?(:lead_organisation_ids) &&
      !edition_params.key?(:supporting_organisation_ids)
  end

Copy link
Copy Markdown
Contributor

@ChrisBAshton ChrisBAshton May 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we also add a corresponding test?

edition_params[:supporting_organisation_ids] = []
end
end

Expand Down