baarkerlounger
/
submit-social-housing-lettings-and-sales-data
mirror of https://github.com/communitiesuk/submit-social-housing-lettings-and-sales-data.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

CLDC-4332: Only show the check for wrong org on edit

pull/3305/head
samyou-softwire 3 weeks ago
parent
c9ab543dac
commit
50f358066f
1 changed files with 1 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      app/controllers/users_controller.rb

2
app/controllers/users_controller.rb
Unescape View File

@ -224,7 +224,7 @@ private
if user_params.key?(:organisation_id) if user_params.key?(:organisation_id)
if user_params[:organisation_id].blank? if user_params[:organisation_id].blank?
@user.errors.add :organisation_id, :blank @user.errors.add :organisation_id, :blank
elsif !@user.role_is_allowed_to_be_in_organisation?(override_organisation_id: user_params[:organisation_id].to_i) elsif !@user.role_is_allowed_to_be_in_organisation?(override_organisation_id: user_params[:organisation_id].to_i) && @user.id != nil
# this will also be flagged by the validation in user.rb. # this will also be flagged by the validation in user.rb.
# for convenience we show the error early before they go through the change org flow (involves reassigning logs). # for convenience we show the error early before they go through the change org flow (involves reassigning logs).
@user.errors.add :organisation_id, I18n.t("validations.user.support_user_in_wrong_organisation.change_organisation") @user.errors.add :organisation_id, I18n.t("validations.user.support_user_in_wrong_organisation.change_organisation")

Write Preview
Loading…
Cancel
Save