From 1a4fab67985d7f0ed36c99929dda24423fe98ceb Mon Sep 17 00:00:00 2001 From: Kat Date: Thu, 13 Apr 2023 12:56:50 +0100 Subject: [PATCH] merge fixes --- app/controllers/merge_requests_controller.rb | 24 +------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/app/controllers/merge_requests_controller.rb b/app/controllers/merge_requests_controller.rb index 65cbbd8ba..11ed2210c 100644 --- a/app/controllers/merge_requests_controller.rb +++ b/app/controllers/merge_requests_controller.rb @@ -9,21 +9,8 @@ class MergeRequestsController < ApplicationController def organisations @merge_request = MergeRequest.find(params[:merge_request_id]) - @answer_options = answer_options - @merging_organisations_list = [@merge_request.requesting_organisation] - end - - def update_organisations - @merge_request = MergeRequest.find(params[:merge_request_id]) - if @merge_request.merging_organisation_ids - @merge_request.merging_organisation_ids << params[:merge_request][:merging_organisation] - @merge_request.save! - else - @merge_request.update!(merging_organisation_ids:[params[:merge_request][:merging_organisation]]) - end - @answer_options = answer_options + @answer_options = organisations_answer_options @merging_organisations_list = [@merge_request.requesting_organisation] + @merge_request.merging_organisations - render "organisations" end def update_organisations @@ -53,15 +40,6 @@ private answer_options end - def answer_options - answer_options = { "" => "Select an option" } - - Organisation.all.pluck(:id, :name).each do |organisation| - answer_options[organisation[0]] = organisation[1] - end - answer_options - end - def merge_request_params merge_params = params.fetch(:merge_request, {}).permit(:requesting_organisation)