From 8e7076ab2ad79ad5b74c48904c5f5fb20a18cade Mon Sep 17 00:00:00 2001
From: Ivan Kljun <ivan@scinote.net>
Date: Thu, 27 Jul 2023 08:22:22 +0200
Subject: [PATCH] Fix modal id name conflict [SCI-8928]

---
 .../projects/index/modals/_edit_project_contents.html.erb     | 4 ++--
 app/views/projects/index/modals/_new_project.html.erb         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/projects/index/modals/_edit_project_contents.html.erb b/app/views/projects/index/modals/_edit_project_contents.html.erb
index 80f7d2292..ce377c946 100644
--- a/app/views/projects/index/modals/_edit_project_contents.html.erb
+++ b/app/views/projects/index/modals/_edit_project_contents.html.erb
@@ -16,14 +16,14 @@
         <div class="checkbox">
           <%= f.check_box :visibility,
                           { label: t('projects.index.modal_new_project.visibility_html'),
-                            data: { action: 'toggle-visibility', target: 'role_select_wrapper' },
+                            data: { action: 'toggle-visibility', target: 'edit_project_role_select_wrapper' },
                             checked: f.object.visible? },
                           :visible,
                           :hidden %>
         </div>
       </div>
     </div>
-    <div class="row <%= f.object.hidden? ? 'hidden' : '' %>" id="role_select_wrapper">
+    <div class="row <%= f.object.hidden? ? 'hidden' : '' %>" id="edit_project_role_select_wrapper">
       <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
         <%= f.select :default_public_user_role_id,
                      options_for_select(user_roles_collection(@project), selected: f.object.default_public_user_role_id),
diff --git a/app/views/projects/index/modals/_new_project.html.erb b/app/views/projects/index/modals/_new_project.html.erb
index 3a1dc91ea..97a525877 100644
--- a/app/views/projects/index/modals/_new_project.html.erb
+++ b/app/views/projects/index/modals/_new_project.html.erb
@@ -17,13 +17,13 @@
             <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
               <div class="checkbox">
                 <%= f.check_box :visibility,
-                                { label: t('projects.index.modal_new_project.visibility_html'), data: { action: 'toggle-visibility', target: 'role_select_wrapper' } },
+                                { label: t('projects.index.modal_new_project.visibility_html'), data: { action: 'toggle-visibility', target: 'new_project_role_select_wrapper' } },
                                 :visible,
                                 :hidden %>
               </div>
             </div>
           </div>
-          <div class="row hidden" id="role_select_wrapper">
+          <div class="row hidden" id="new_project_role_select_wrapper">
             <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
               <%= f.select :default_public_user_role_id,
                            options_for_select(user_roles_collection(@project), UserRole.find_by(name: I18n.t('user_roles.predefined.viewer')).id),