scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-06 15:40:31 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix modal id name conflict [SCI-8928]

Browse source
This commit is contained in:
Ivan Kljun 2023-07-27 08:22:22 +02:00
parent 3978d9efef
commit 8e7076ab2a
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/views/projects/index/modals/_edit_project_contents.html.erb
View file

@ -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),

4
app/views/projects/index/modals/_new_project.html.erb
View file

@ -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),