scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-10 23:25:31 +08:00
Code Issues Projects Releases Packages Wiki Activity

Refactor access modals [SCI-7978]

Browse source
This commit is contained in:
Martin Artnik 2023-02-23 14:57:38 +01:00
parent b0fc97a549
commit c24b0fa5ab
39 changed files with 131 additions and 272 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/controllers/access_permissions/experiments_controller.rb
View file

@ -2,8 +2,8 @@
module AccessPermissions
class ExperimentsController < ApplicationController
before_action :set_project
before_action :set_experiment
before_action :set_project
before_action :check_read_permissions, only: %i(show)
before_action :check_manage_permissions, only: %i(edit update)
@ -59,13 +59,11 @@ module AccessPermissions
end
def set_project
@project = current_team.projects.find_by(id: params[:project_id])
render_404 unless @project
@project = @experiment.project
end
def set_experiment
@experiment = @project.experiments.includes(user_assignments: %i(user user_role)).find_by(id: params[:id])
@experiment = Experiment.includes(user_assignments: %i(user user_role)).find_by(id: params[:id])
render_404 unless @experiment
end

14
app/controllers/access_permissions/my_modules_controller.rb
View file

@ -2,9 +2,9 @@
module AccessPermissions
class MyModulesController < ApplicationController
before_action :set_project
before_action :set_experiment
before_action :set_my_module
before_action :set_experiment
before_action :set_project
before_action :check_read_permissions, only: %i(show)
before_action :check_manage_permissions, only: %i(edit update)
@ -53,19 +53,15 @@ module AccessPermissions
end
def set_project
@project = current_team.projects.find_by(id: params[:project_id])
render_404 unless @project
@project = @experiment.project
end
def set_experiment
@experiment = @project.experiments.find_by(id: params[:experiment_id])
render_404 unless @experiment
@experiment = @my_module.experiment
end
def set_my_module
@my_module = @experiment.my_modules.includes(user_assignments: %i(user user_role)).find_by(id: params[:id])
@my_module = MyModule.includes(user_assignments: %i(user user_role)).find_by(id: params[:id])
render_404 unless @my_module
end

4
app/controllers/access_permissions/projects_controller.rb
View file

@ -49,6 +49,7 @@ module AccessPermissions
def create
ActiveRecord::Base.transaction do
created_count = 0
permitted_create_params[:resource_members].each do |_k, user_assignment_params|
next unless user_assignment_params[:assign] == '1'
@ -65,11 +66,12 @@ module AccessPermissions
)
log_activity(:assign_user_to_project, user_assignment)
created_count += 1
propagate_job(user_assignment)
end
respond_to do |format|
@message = t('access_permissions.create.success', count: @project.user_assignments.count)
@message = t('access_permissions.create.success', count: created_count)
format.json { render :edit }
end
rescue ActiveRecord::RecordInvalid

5
app/controllers/access_permissions/protocols_controller.rb
View file

@ -47,19 +47,22 @@ module AccessPermissions
def create
ActiveRecord::Base.transaction do
created_count = 0
permitted_create_params[:resource_members].each do |_k, user_assignment_params|
next unless user_assignment_params[:assign] == '1'
user_assignment = UserAssignment.new(user_assignment_params)
user_assignment.assignable = @protocol
user_assignment.assigned = :manually
user_assignment.team = current_team
user_assignment.assigned_by = current_user
user_assignment.save!
created_count += 1
log_activity(:protocol_template_access_granted, user_assignment)
end
respond_to do |format|
@message = t('access_permissions.create.success', count: @protocol.user_assignments.count)
@message = t('access_permissions.create.success', count: created_count)
format.json { render :edit }
end
rescue ActiveRecord::RecordInvalid

3
app/models/protocol.rb
View file

@ -40,7 +40,8 @@ class Protocol < ApplicationRecord
validate :prevent_update,
on: :update,
if: lambda {
in_repository_published? && !protocol_type_changed?(from: 'in_repository_draft') && !archived_changed?
changes.keys != %w(default_public_user_role_id) && # skip check if only public role changed
in_repository_published? && !protocol_type_changed?(from: 'in_repository_draft') && !archived_changed?
}
with_options if: :in_module? do

9
app/services/experiments/table_view_service.rb
View file

@ -68,7 +68,6 @@ module Experiments
end
experiment = my_module.experiment
project = experiment.project
result.push({ id: my_module.id,
columns: prepared_my_module,
@ -81,7 +80,7 @@ module Experiments
provisioning_status:
my_module.provisioning_status == 'in_progress' &&
provisioning_status_my_module_url(my_module),
access: access_url(project, experiment, my_module)
access: access_url(my_module)
} })
end
@ -93,11 +92,11 @@ module Experiments
private
def access_url(project, experiment, my_module)
def access_url(my_module)
if can_manage_my_module_users?(@user, my_module)
edit_access_permissions_project_experiment_my_module_path(project, experiment, my_module)
edit_access_permissions_my_module_path(my_module)
else
access_permissions_project_experiment_my_module_path(project, experiment, my_module)
access_permissions_my_module_path(my_module)
end
end

9
app/views/access_permissions/experiments/edit.json.jbuilder
View file

@ -1,13 +1,12 @@
# frozen_string_literal: true
json.modal controller.render_to_string(
partial: 'access_permissions/experiments/modals/edit_modal',
partial: 'access_permissions/modals/edit_modal',
formats: [:html],
locals: {
experiment: @experiment,
project: @project,
users: @project.manually_assigned_users,
project_path: project_path(@project)
assignable: @experiment,
top_level_assignable: @project,
manually_assigned_users: @project.manually_assigned_users
},
layout: false
)

4
app/views/access_permissions/experiments/experiment_member.json.jbuilder
View file

@ -5,9 +5,9 @@ json.form controller.render_to_string(
formats: [:html],
locals: {
user: @user_assignment.user,
object: @experiment,
assignable: @experiment,
with_inherit: true,
update_path: access_permissions_project_experiment_path(@project, @experiment)
update_path: access_permissions_experiment_path(@experiment)
},
layout: false
)

28
app/views/access_permissions/experiments/modals/_edit_modal.html.erb
View file

@ -1,28 +0,0 @@
<% # frozen_string_literal: true %>
<div class="modal fade user-assignments-modal experiment-assignments-modal" tabindex="-1" role="dialog" data-action="modal-close">
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content" id="user_assignments_modal">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title"><%= t '.title', resource_name: experiment.name %></h4>
</div>
<div class="modal-body">
<p class="user-assignments-description">
<%= t '.description' %>
</p>
<hr />
<% users.order(full_name: :asc).each do |user| %>
<%= render partial: 'access_permissions/partials/member_field',
locals: {
user: user,
with_inherit: true,
object: experiment,
update_path: access_permissions_project_experiment_path(project, experiment)
} %>
<% end %>
<%= render('access_permissions/partials/default_public_user_role_form', project: project, editable: false) if project.visible? %>
</div>
</div>
</div>
</div>

6
app/views/access_permissions/experiments/show.json.jbuilder
View file

@ -4,9 +4,9 @@ json.modal controller.render_to_string(
partial: 'access_permissions/experiments/modals/show_modal',
formats: [:html],
locals: {
experiment: @experiment,
users: @project.manually_assigned_users,
project_path: project_path(@project)
assignable: @experiment,
top_level_assignable: @project,
manually_assigned_users: @project.manually_assigned_users
},
layout: false
)

32
app/views/access_permissions/modals/_edit_modal.html.erb Normal file
View file

@ -0,0 +1,32 @@
<% # frozen_string_literal: true %>
<div class="modal fade user-assignments-modal <%= assignable.class.name.parameterize(separator: '-') %>-assignments-modal" tabindex="-1" role="dialog" data-action="modal-close">
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content" id="user_assignments_modal">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title"><%= t "access_permissions.#{assignable.class.name.pluralize.underscore}.modals.edit_modal.title", resource_name: assignable.name %></h4>
</div>
<div class="modal-body">
<% manually_assigned_users.order(full_name: :asc).each do |user| %>
<%= render('access_permissions/partials/member_field',
user: user,
assignable: assignable,
update_path: public_send("access_permissions_#{assignable.class.name.underscore}_path", assignable),
delete_path: public_send("access_permissions_#{assignable.class.name.underscore}_path", assignable, user_id: user.id)
) %>
<% end %>
<%= render('access_permissions/partials/default_public_user_role_form', assignable: top_level_assignable, editable: assignable == top_level_assignable) if top_level_assignable.respond_to?(:visible?) && top_level_assignable.visible? %>
</div>
<% if assignable.top_level_assignable? %>
<div class="modal-footer">
<%= link_to new_assignment_path, class: 'btn btn-default pull-left', data: { action: 'swap-remote-container', target: '#user_assignments_modal' } do %>
<i class="fas fa-plus"></i>
<%= t('access_permissions.grant_access') %>
<% end %>
</div>
<% end %>
</div>
</div>
</div>

13
app/views/access_permissions/experiments/modals/_show_modal.html.erb → app/views/access_permissions/modals/_show_modal.html.erb
View file

@ -1,19 +1,18 @@
<% # frozen_string_literal: true %>
<div class="modal fade experiment-assignments-modal" tabindex="-1" role="dialog" data-action="modal-close">
<div class="modal fade <%= assignable.class.name.parameterize(separator: '-') %>-assignments-modal" tabindex="-1" role="dialog" data-action="modal-close">
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content" id="user_assignments_modal">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title"><%= t '.title', resource_name: experiment.name %></h4>
<h4 class="modal-title"><%= t "access_permissions.#{assignable.class.name.pluralize.underscore}.modals.show_modal.title", assignable_name: assignable.name %></h4>
</div>
<div class="modal-body">
<% users.order(full_name: :asc).each do |user| %>
<% user_assignment = experiment.user_assignments.find_by(user: user) %>
<% next if user_assignment.blank? %>
<%= render partial: 'access_permissions/partials/user_assignment', locals: { user_assignment: user_assignment, user: user, resource: experiment } %>
<% manually_assigned_users.order(full_name: :asc).each do |user| %>
<% user_assignment = assignable.user_assignments.find_by(user: user) %>
<%= render partial: 'access_permissions/partials/user_assignment', locals: { user_assignment: user_assignment, user: user, assignable: assignable } %>
<% end %>
<%= render('access_permissions/partials/default_public_user_role_form', project: experiment.project, editable: false) if experiment.project.visible? %>
<%= render('access_permissions/partials/default_public_user_role_form', assignable: assignable, editable: false) if assignable.respond_to?(:visible?) && assignable.visible? %>
</div>
</div>
</div>

9
app/views/access_permissions/my_modules/edit.json.jbuilder
View file

@ -1,13 +1,12 @@
# frozen_string_literal: true
json.modal controller.render_to_string(
partial: 'access_permissions/my_modules/modals/edit_modal',
partial: 'access_permissions/modals/edit_modal',
formats: [:html],
locals: {
my_module: @my_module,
experiment: @experiment,
project: @project,
users: @project.manually_assigned_users
assignable: @my_module,
top_level_assignable: @project,
manually_assigned_users: @project.manually_assigned_users
},
layout: false
)

28
app/views/access_permissions/my_modules/modals/_edit_modal.html.erb
View file

@ -1,28 +0,0 @@
<% # frozen_string_literal: true %>
<div class="modal fade user-assignments-modal my-module-assignments-modal" tabindex="-1" role="dialog">
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content" id="user_assignments_modal">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title"><%= t '.title', resource_name: my_module.name %></h4>
</div>
<div class="modal-body">
<p class="user-assignments-description">
<%= t '.description' %>
</p>
<hr />
<% users.order(full_name: :asc).each do |user| %>
<%= render partial: 'access_permissions/partials/member_field',
locals: {
user: user,
with_inherit: true,
object: my_module,
update_path: access_permissions_project_experiment_my_module_path(project, experiment, my_module)
} %>
<% end %>
<%= render('access_permissions/partials/default_public_user_role_form', project: project, editable: false) if project.visible? %>
</div>
</div>
</div>
</div>

21
app/views/access_permissions/my_modules/modals/_show_modal.html.erb
View file

@ -1,21 +0,0 @@
<% # frozen_string_literal: true %>
<div class="modal fade my-module-assignments-modal" tabindex="-1" role="dialog">
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content" id="user_assignments_modal">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title"><%= t '.title', resource_name: my_module.name %></h4>
</div>
<div class="modal-body">
<% users.order(full_name: :asc).each do |user| %>
<% user_assignment = my_module.user_assignments.find_by(user: user) %>
<% next if user_assignment.blank? %>
<%= render partial: 'access_permissions/partials/user_assignment', locals: { user_assignment: user_assignment, user: user, resource: my_module } %>
<% end %>
<%= render('access_permissions/partials/default_public_user_role_form',
project: my_module.experiment.project, editable: false) if my_module.experiment.project.visible? %>
</div>
</div>
</div>
</div>

6
app/views/access_permissions/my_modules/my_module_member.json.jbuilder
View file

@ -5,11 +5,9 @@ json.form controller.render_to_string(
formats: [:html],
locals: {
user: @user_assignment.user,
update_path: access_permissions_my_module_path(@my_module)
with_inherit: true,
object: @my_module,
update_path: access_permissions_project_experiment_my_module_path(@project,
@experiment,
@my_module)
assignable: @my_module
},
layout: false
)

8
app/views/access_permissions/my_modules/show.json.jbuilder
View file

@ -1,12 +1,12 @@
# frozen_string_literal: true
json.modal controller.render_to_string(
partial: 'access_permissions/my_modules/modals/show_modal',
partial: 'access_permissions/modals/show_modal',
formats: [:html],
locals: {
my_module: @my_module,
experiment: @experiment,
users: @project.manually_assigned_users
assignable: @my_module,
top_level_assignable: @project,
manually_assigned_users: @project.manually_assigned_users
},
layout: false
)

14
app/views/access_permissions/partials/_default_public_user_role_form.html.erb
View file

@ -1,16 +1,16 @@
<%= form_with(model: project, url: update_default_public_user_role_access_permissions_project_path(project), method: :put, remote: true, html: { class: 'row member-item', id: 'public_assignments', data: { action: 'replace-form autosave-form', object_type: :project } }) do |f| %>
<%= form_with(model: assignable, url: [:update_default_public_user_role, :access_permissions, assignable], method: :put, remote: true, html: { class: 'row member-item', id: 'public_assignments', data: { action: 'replace-form autosave-form', object_type: assignable.class.name.underscore.to_sym } }) do |f| %>
<div class="user-assignment-info">
<div class="global-avatar-container">
<%= image_tag "icon/team.png", class: 'img-circle pull-left' %>
</div>
<div>
<%= t('access_permissions.everyone_else', team_name: project.team.name) %>
<%= render 'access_permissions/partials/public_members_dropdown', team: project.team, assignable: project %>
<%= t('access_permissions.everyone_else', team_name: assignable.team.name) %>
<%= render 'access_permissions/partials/public_members_dropdown', team: assignable.team, assignable: assignable %>
<br>
<small class="text-muted">
<%= project.default_public_user_role.name %>
<span class="permission-object-tag" title="<%= t("access_permissions.partials.project_tooltip") %>"">
<%= t("access_permissions.partials.project") %>
<%= assignable.default_public_user_role.name %>
<span class="permission-object-tag" title="<%= t("access_permissions.partials.#{assignable.class.name.underscore}_tooltip") %>"">
<%= t("access_permissions.partials.#{assignable.class.name.underscore}") %>
</span>
</small>
</div>
@ -18,7 +18,7 @@
<div class="user-assignment-controls">
<div class="user-assignment-role">
<% if editable %>
<%= f.select :default_public_user_role_id, options_for_select(user_roles_collection, selected: project.default_public_user_role_id), {}, class: 'form-control selectpicker', title: t('user_assignment.change_project_role'), data: { 'selected-text-format' => 'static' } %>
<%= f.select :default_public_user_role_id, options_for_select(user_roles_collection, selected: assignable.default_public_user_role_id), {}, class: 'form-control selectpicker', title: t("user_assignment.change_#{assignable.class.name.underscore}_role"), data: { 'selected-text-format' => 'static' } %>
<% end %>
</div>
</div>

8
app/views/access_permissions/partials/_member_field.html.erb
View file

@ -1,11 +1,11 @@
<% # frozen_string_literal: true %>
<%
object_assignment = object.user_assignments.find_by(user_id: user.id, team: current_team)
assignment = assignable.user_assignments.find_by(user_id: user.id, team: current_team)
item_id = dom_id(user, :assignment_member)
%>
<%= form_with(model: object_assignment, url: update_path, method: :put, remote: true, html: { class: 'member-item', id: item_id, data: { action: 'replace-form autosave-form', object_type: :assignment_member } }) do |f| %>
<%= form_with(model: assignment, url: update_path, method: :put, remote: true, html: { class: 'member-item', id: item_id, data: { action: 'replace-form autosave-form', object_type: :assignment_member } }) do |f| %>
<%= f.hidden_field :user_id, value: f.object.user.id %>
<div class="user-assignment-info">
<div class="global-avatar-container">
@ -14,7 +14,7 @@
<div>
<%= current_assignee_name(user) %>
<br>
<small class="text-muted"><%= user_assignment_resource_role_name(user, object) %></small>
<small class="text-muted"><%= user_assignment_resource_role_name(user, assignable) %></small>
</div>
</div>
<div class="user-assignment-controls">
@ -33,7 +33,7 @@
</a>
</li>
<% end %>
<% if defined?(delete_path) && !object_assignment.last_assignable_owner? %>
<% if defined?(delete_path) && !assignment.last_assignable_owner? %>
<li role="separator" class="divider" data-hook="support-dropdown-separator"></li>
<li>
<%= link_to delete_path, remote: true, method: :delete, data: { action: 'remote-destroy', target: "##{item_id}" } do %>

6
app/views/access_permissions/partials/_new_assignments_form.html.erb
View file

@ -4,13 +4,13 @@
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title">
<%= link_to resource_path, remote: true, class: 'pull-left spacer', data: { action: 'swap-remote-container', target: '#user_assignments_modal' } do %>
<%= link_to assignable_path, remote: true, class: 'pull-left spacer', data: { action: 'swap-remote-container', target: '#user_assignments_modal' } do %>
<i class="fas fa-arrow-left"></i>
<% end %>
<%= t '.title', resource_name: resource.name %>
<%= t '.title', resource_name: assignable.name %>
</h4>
</div>
<%= form_with(url: create_path, method: :post, remote: true, html: { id: 'new-user-assignment-form', data: { action: 'replace-form', target: '#user_assignments_modal', object_type: resource.class.to_s.downcase} }) do |f| %>
<%= form_with(url: create_path, method: :post, remote: true, html: { id: 'new-user-assignment-form', data: { action: 'replace-form', target: '#user_assignments_modal', object_type: assignable.class.to_s.downcase} }) do |f| %>
<div class="modal-body">
<div class="sci-input-container left-icon">
<%= text_field_tag :search_users, '', placeholder: t('.find_people_html'), class: 'sci-input-field', data: { action: 'filter-list', target: 'new-user-assignment-to-project-form' } %>

2
app/views/access_permissions/partials/_user_assignment.html.erb
View file

@ -10,6 +10,6 @@
</div>
</div>
<div class="user-assignment-controls">
<%= resource.user_assignments.find_by(user: user, team: current_team).user_role.name %>
<%= assignable.user_assignments.find_by(user: user, team: current_team).user_role.name %>
</div>
</div>

9
app/views/access_permissions/projects/edit.json.jbuilder
View file

@ -1,12 +1,13 @@
# frozen_string_literal: true
json.html controller.render_to_string(
partial: 'access_permissions/projects/modals/edit_modal',
partial: 'access_permissions/modals/edit_modal',
formats: [:html],
locals: {
project: @project,
update_path: access_permissions_project_path(@project),
new_resource_path: new_access_permissions_project_path(id: @project)
assignable: @project,
manually_assigned_users: @project.manually_assigned_users,
top_level_assignable: @project,
new_assignment_path: new_access_permissions_project_path(id: @project)
},
layout: false
)

30
app/views/access_permissions/projects/modals/_edit_modal.html.erb
View file

@ -1,30 +0,0 @@
<% # frozen_string_literal: true %>
<div class="modal fade user-assignments-modal project-assignments-modal" tabindex="-1" role="dialog" data-action="modal-close">
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content" id="user_assignments_modal">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title"><%= t '.title', resource_name: project.name %></h4>
</div>
<div class="modal-body">
<% project.manually_assigned_users.order(full_name: :asc).each do |user| %>
<%= render('access_permissions/partials/member_field',
user: user,
object: project,
update_path: update_path,
delete_path: access_permissions_project_path(project, user_id: user.id)
) %>
<% end %>
<%= render('access_permissions/partials/default_public_user_role_form', project: project, editable: true) if project.visible? %>
</div>
<div class="modal-footer">
<%= link_to new_resource_path, class: 'btn btn-default pull-left', data: { action: 'swap-remote-container', target: '#user_assignments_modal' } do %>
<i class="fas fa-plus"></i>
<%= t('access_permissions.grant_access') %>
<% end %>
</div>
</div>
</div>
</div>

19
app/views/access_permissions/projects/modals/_show_modal.html.erb
View file

@ -1,19 +0,0 @@
<% # frozen_string_literal: true %>
<div class="modal fade project-assignments-modal" tabindex="-1" role="dialog" data-action="modal-close">
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content" id="user_assignments_modal">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title"><%= t '.title', resource_name: project.name %></h4>
</div>
<div class="modal-body">
<% users.order(full_name: :asc).each do |user| %>
<% user_assignment = project.user_assignments.find_by(user: user) %>
<%= render partial: 'access_permissions/partials/user_assignment', locals: { user_assignment: user_assignment, user: user, resource: project } %>
<% end %>
<%= render('access_permissions/partials/default_public_user_role_form', project: project, editable: false) if project.visible? %>
</div>
</div>
</div>
</div>

4
app/views/access_permissions/projects/new.json.jbuilder
View file

@ -4,11 +4,11 @@ json.html controller.render_to_string(
partial: 'access_permissions/partials/new_assignments_form',
formats: [:html],
locals: {
resource: @project,
assignable: @project,
form_object: @user_assignment,
users: @available_users,
create_path: access_permissions_projects_path(id: @project.id),
resource_path: edit_access_permissions_project_path(@project)
assignable_path: edit_access_permissions_project_path(@project)
},
layout: false
)

2
app/views/access_permissions/projects/project_member.json.jbuilder
View file

@ -5,7 +5,7 @@ json.form controller.render_to_string(
formats: [:html],
locals: {
user: @user_assignment.user,
object: @project,
assignable: @project,
update_path: access_permissions_project_path(@project),
delete_path: access_permissions_project_path(@project, user_id: @user_assignment.user.id)
},

9
app/views/access_permissions/projects/show.json.jbuilder
View file

@ -1,12 +1,13 @@
# frozen_string_literal: true
json.modal controller.render_to_string(
partial: 'access_permissions/projects/modals/show_modal',
partial: 'access_permissions/modals/show_modal',
formats: [:html],
locals: {
project: @project,
users: @project.manually_assigned_users,
can_manage_resource: can_manage_project_users?(@project)
assignable: @project,
manually_assigned_users: @project.manually_assigned_users,
top_level_assignable: @project,
users: @project.manually_assigned_users
},
layout: false
)

2
app/views/access_permissions/projects/update_default_public_user_role.json.jbuilder
View file

@ -4,7 +4,7 @@ json.form controller.render_to_string(
partial: 'access_permissions/partials/default_public_user_role_form',
formats: [:html],
locals: {
project: @project,
assignable: @project,
editable: true
},
layout: false

8
app/views/access_permissions/protocols/edit.json.jbuilder
View file

@ -1,12 +1,14 @@
# frozen_string_literal: true
json.html controller.render_to_string(
partial: 'access_permissions/protocols/modals/edit_modal',
partial: 'access_permissions/modals/edit_modal',
formats: [:html],
locals: {
protocol: @protocol,
assignable: @protocol,
top_level_assignable: @protocol,
manually_assigned_users: @protocol.manually_assigned_users,
update_path: access_permissions_protocol_path(@protocol),
new_resource_path: new_access_permissions_protocol_path(id: @protocol)
new_assignment_path: new_access_permissions_protocol_path(id: @protocol)
},
layout: false
)

29
app/views/access_permissions/protocols/modals/_edit_modal.html.erb
View file

@ -1,29 +0,0 @@
<% # frozen_string_literal: true %>
<div class="modal fade user-assignments-modal protocol-assignments-modal" tabindex="-1" role="dialog" data-action="modal-close">
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content" id="user_assignments_modal">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title"><%= t '.title', resource_name: protocol.name %></h4>
</div>
<div class="modal-body">
<% protocol.assigned_users.order(full_name: :asc).each do |user| %>
<%= render('access_permissions/partials/member_field',
user: user,
object: protocol,
update_path: update_path,
delete_path: access_permissions_protocol_path(protocol, user_id: user.id)
) %>
<% end %>
</div>
<div class="modal-footer">
<%= link_to new_resource_path, class: 'btn btn-default pull-left', data: { action: 'swap-remote-container', target: '#user_assignments_modal' } do %>
<i class="fas fa-plus"></i>
<%= t('access_permissions.grant_access') %>
<% end %>
</div>
</div>
</div>
</div>

18
app/views/access_permissions/protocols/modals/_show_modal.html.erb
View file

@ -1,18 +0,0 @@
<% # frozen_string_literal: true %>
<div class="modal fade protocol-assignments-modal" tabindex="-1" role="dialog" data-action="modal-close">
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content" id="user_assignments_modal">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title"><%= t '.title', resource_name: protocol.name %></h4>
</div>
<div class="modal-body">
<% users.order(full_name: :asc).each do |user| %>
<% user_assignment = protocol.user_assignments.find_by(user: user) %>
<%= render partial: 'access_permissions/partials/user_assignment', locals: { user_assignment: user_assignment, user: user, resource: protocol } %>
<% end %>
</div>
</div>
</div>
</div>

4
app/views/access_permissions/protocols/new.json.jbuilder
View file

@ -4,11 +4,11 @@ json.html controller.render_to_string(
partial: 'access_permissions/partials/new_assignments_form',
formats: [:html],
locals: {
resource: @protocol,
assignable: @protocol,
form_object: @user_assignment,
users: current_team.users.where.not(id: @protocol.assigned_users.select(:id)),
create_path: access_permissions_protocols_path(id: @protocol.id),
resource_path: edit_access_permissions_protocol_path(@protocol)
assignable_path: edit_access_permissions_protocol_path(@protocol)
},
layout: false
)

2
app/views/access_permissions/protocols/protocol_member.json.jbuilder
View file

@ -5,7 +5,7 @@ json.form controller.render_to_string(
formats: [:html],
locals: {
user: @user_assignment.user,
object: @protocol,
assignable: @protocol,
update_path: access_permissions_protocol_path(@protocol),
delete_path: access_permissions_protocol_path(@protocol, user_id: @user_assignment.user_id)
},

2
app/views/canvas/edit/_my_module_dropdown_menu.html.erb
View file

@ -15,7 +15,7 @@
<% end %>
<li>
<%= link_to t('experiments.canvas.edit.task_access'),
can_manage_my_module_users?(my_module) ? edit_access_permissions_project_experiment_my_module_path(my_module.experiment.project, my_module.experiment, my_module) : access_permissions_project_experiment_my_module_path(my_module.experiment.project, my_module.experiment, my_module),
can_manage_my_module_users?(my_module) ? edit_access_permissions_my_module_path(my_module) : access_permissions_my_module_path(my_module),
data: { action: 'remote-modal'} %>
</li>
<% if can_archive_my_module?(my_module) %>

4
app/views/experiments/_dropdown_actions.html.erb
View file

@ -43,14 +43,14 @@
<!-- Set or view user experiment assignments -->
<% if can_manage_experiment_users?(experiment) %>
<li>
<%= link_to edit_access_permissions_project_experiment_path(project, experiment), data: { action: 'remote-modal'} do %>
<%= link_to edit_access_permissions_experiment_path(experiment), data: { action: 'remote-modal'} do %>
<i class="fas fa-door-open"></i>
<span><%= t('experiments.index.experiment_access') %></span>
<% end %>
</li>
<% else %>
<li>
<%= link_to access_permissions_project_experiment_path(project, experiment), data: { action: 'remote-modal'} do %>
<%= link_to access_permissions_experiment_path(experiment), data: { action: 'remote-modal'} do %>
<i class="fas fa-door-open"></i>
<span><%= t('experiments.index.experiment_access') %></span>
<% end %>

4
app/views/experiments/_table_row_actions.html.erb
View file

@ -24,9 +24,9 @@
</li>
<% end %>
<% if can_manage_my_module_users?(my_module) %>
<% task_access_path = edit_access_permissions_project_experiment_my_module_path(my_module.experiment.project, my_module.experiment, my_module) %>
<% task_access_path = edit_access_permissions_my_module_path(my_module) %>
<% else %>
<% task_access_path = access_permissions_project_experiment_my_module_path(my_module.experiment.project, my_module.experiment, my_module) %>
<% task_access_path = access_permissions_my_module_path(my_module) %>
<% end %>
<li>
<a class="open-access-modal" data-action="remote-modal" href="<%= task_access_path %>">

4
app/views/my_modules/_module_header_details_popover.html.erb
View file

@ -51,8 +51,8 @@
<div class="col-xs-12">
<%= link_to t('my_modules.details.info_popover.view_task_access'),
can_manage_my_module_users?(@my_module) ?
edit_access_permissions_project_experiment_my_module_path(@my_module.experiment.project, @my_module.experiment, @my_module) :
access_permissions_project_experiment_my_module_path(@my_module.experiment.project, @my_module.experiment, @my_module),
edit_access_permissions_my_module_path(@my_module) :
access_permissions_my_module_path(@my_module),
data: { action: 'remote-modal'} %>
</div>
</div>

4
app/views/projects/show/_experiment_actions_dropdown.html.erb
View file

@ -35,14 +35,14 @@
<!-- Set or view user experiment assignments -->
<% if can_manage_experiment_users?(experiment) %>
<li class="form-dropdown-item">
<%= link_to edit_access_permissions_project_experiment_path(experiment.project, experiment), data: { action: 'remote-modal'} do %>
<%= link_to edit_access_permissions_experiment_path(experiment), data: { action: 'remote-modal'} do %>
<i class="fas fa-door-open"></i>
<span><%= t('experiments.index.experiment_access') %></span>
<% end %>
</li>
<% else %>
<li class="form-dropdown-item">
<%= link_to access_permissions_project_experiment_path(experiment.project, experiment), data: { action: 'remote-modal'} do %>
<%= link_to access_permissions_experiment_path(experiment), data: { action: 'remote-modal'} do %>
<i class="fas fa-door-open"></i>
<span><%= t('experiments.index.experiment_access') %></span>
<% end %>

12
config/routes.rb
View file

@ -280,14 +280,16 @@ Rails.application.routes.draw do
end
namespace :access_permissions do
resources :protocols, defaults: { format: 'json' }
resources :projects, defaults: { format: 'json' } do
put :update_default_public_user_role, on: :member
resources :experiments, only: %i(show update edit) do
resources :my_modules, only: %i(show update edit)
end
end
resources :protocols, only: %i(show update edit)
resources :protocols, defaults: { format: 'json' } do
put :update_default_public_user_role, on: :member
end
resources :experiments, only: %i(show update edit)
resources :my_modules, only: %i(show update edit)
end
resources :projects, except: [:destroy] do