From c07c705b7ce7940a5f213f9a166b2a81efb0cab0 Mon Sep 17 00:00:00 2001 From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com> Date: Mon, 12 Aug 2024 13:31:44 +0100 Subject: [PATCH] Move merge request related views --- app/controllers/organisations_controller.rb | 1 + .../_merge_request_list.html.erb | 0 .../{organisations => merge_requests}/merge_request.html.erb | 0 app/views/organisations/index.html.erb | 2 +- 4 files changed, 2 insertions(+), 1 deletion(-) rename app/views/{organisations => merge_requests}/_merge_request_list.html.erb (100%) rename app/views/{organisations => merge_requests}/merge_request.html.erb (100%) diff --git a/app/controllers/organisations_controller.rb b/app/controllers/organisations_controller.rb index 5d2225a6e..04e100ce6 100644 --- a/app/controllers/organisations_controller.rb +++ b/app/controllers/organisations_controller.rb @@ -238,6 +238,7 @@ class OrganisationsController < ApplicationController def merge_request @merge_request = MergeRequest.new + render "merge_requests/merge_request" end def data_sharing_agreement diff --git a/app/views/organisations/_merge_request_list.html.erb b/app/views/merge_requests/_merge_request_list.html.erb similarity index 100% rename from app/views/organisations/_merge_request_list.html.erb rename to app/views/merge_requests/_merge_request_list.html.erb diff --git a/app/views/organisations/merge_request.html.erb b/app/views/merge_requests/merge_request.html.erb similarity index 100% rename from app/views/organisations/merge_request.html.erb rename to app/views/merge_requests/merge_request.html.erb diff --git a/app/views/organisations/index.html.erb b/app/views/organisations/index.html.erb index 4701e67fd..728c63736 100644 --- a/app/views/organisations/index.html.erb +++ b/app/views/organisations/index.html.erb @@ -16,7 +16,7 @@ <% end %> <% c.with_tab(label: "Merge requests") do %> <%= govuk_button_link_to "Create new merge request", "/organisations/#{current_user.organisation_id}/merge-request", html: { method: :get } %> - <%= render partial: "merge_request_list", locals: { merge_requests: @merge_requests, title: "Merge requests", pagy: @pagy, searched: @searched, item_label:, total_count: @total_count } %> + <%= render partial: "merge_requests/merge_request_list", locals: { merge_requests: @merge_requests, title: "Merge requests", pagy: @pagy, searched: @searched, item_label:, total_count: @total_count } %> <% end %> <% end %>