diff --git a/app/controllers/schemes_controller.rb b/app/controllers/schemes_controller.rb index be90d9032..a7c0fa286 100644 --- a/app/controllers/schemes_controller.rb +++ b/app/controllers/schemes_controller.rb @@ -103,7 +103,7 @@ private end def scheme_params - required_params = params.require(:scheme).permit(:service_name, :sensitive, :organisation_id, :scheme_type, :registered_under_care_act, :total_units, :id, :has_other_client_group, :primary_client_group, :secondary_client_group, :support_type, :intended_stay) + required_params = params.require(:scheme).permit(:service_name, :sensitive, :organisation_id, :stock_owning_organisation_id, :scheme_type, :registered_under_care_act, :total_units, :id, :has_other_client_group, :primary_client_group, :secondary_client_group, :support_type, :intended_stay) required_params[:sensitive] = required_params[:sensitive].to_i if required_params[:sensitive] if current_user.data_coordinator? required_params[:organisation_id] = current_user.organisation_id diff --git a/app/views/schemes/details.html.erb b/app/views/schemes/details.html.erb index 037d953db..1b7007d3a 100644 --- a/app/views/schemes/details.html.erb +++ b/app/views/schemes/details.html.erb @@ -25,17 +25,25 @@ multiple: false, label: { text: "This scheme contains confidential information" } %> - <% if current_user.support? %> - <% answer_options = Organisation.all.map { |org| OpenStruct.new(id: org.id, name: org.name) } %> + <% null_option = [OpenStruct.new(id: "", name: "Select an option")] %> + <% organisations = Organisation.all.map { |org| OpenStruct.new(id: org.id, name: org.name) } %> + <% stock_org_answer_options = null_option + organisations %> + + <%= f.govuk_collection_select :stock_owning_organisation_id, + stock_org_answer_options, + :id, + :name, + label: { text: "Which organisation owns the housing stock for this scheme?", size: "m" }, + "data-controller": %w[accessible-autocomplete conditional-filter] %> + <% if current_user.support? %> <%= f.govuk_collection_select :organisation_id, - answer_options, - :id, - :name, - label: { text: "Which organisation manages this scheme", size: "m" }, - hint: { text: "Enter organisation name" }, - options: { required: true }, - "data-controller": %w[accessible-autocomplete conditional-filter] %> + organisations, + :id, + :name, + label: { text: "Which organisation manages this scheme?", size: "m" }, + options: { required: true }, + "data-controller": %w[accessible-autocomplete conditional-filter] %> <% end %> <% if current_user.data_coordinator? %>