From d1a68adb22e98c092cad32de39a06024e3c20d3a Mon Sep 17 00:00:00 2001 From: Anton Date: Thu, 22 Dec 2022 13:27:46 +0100 Subject: [PATCH 1/3] Add access modal for protocols [SCI-7518] --- .../protocols_controller.rb | 99 +++++++++++++++++++ app/models/user_assignment.rb | 10 ++ .../partials/_protocol_member_field.html.erb | 33 +++++++ .../_protocol_public_user_role_form.html.erb | 20 ++++ .../_public_members_dropdown.html.erb | 9 +- .../protocols/edit.json.jbuilder | 14 +++ .../protocols/modals/_edit_modal.html.erb | 25 +++++ .../protocols/modals/_show_modal.html.erb | 19 ++++ .../protocols/new.json.jbuilder | 13 +++ .../protocols/protocol_member.json.jbuilder | 12 +++ .../protocols/show.json.jbuilder | 12 +++ ...ate_default_public_user_role.json.jbuilder | 11 +++ config/locales/en.yml | 12 +++ config/routes.rb | 3 + 14 files changed, 291 insertions(+), 1 deletion(-) create mode 100644 app/controllers/access_permissions/protocols_controller.rb create mode 100644 app/views/access_permissions/partials/_protocol_member_field.html.erb create mode 100644 app/views/access_permissions/partials/_protocol_public_user_role_form.html.erb create mode 100644 app/views/access_permissions/protocols/edit.json.jbuilder create mode 100644 app/views/access_permissions/protocols/modals/_edit_modal.html.erb create mode 100644 app/views/access_permissions/protocols/modals/_show_modal.html.erb create mode 100644 app/views/access_permissions/protocols/new.json.jbuilder create mode 100644 app/views/access_permissions/protocols/protocol_member.json.jbuilder create mode 100644 app/views/access_permissions/protocols/show.json.jbuilder create mode 100644 app/views/access_permissions/protocols/update_default_public_user_role.json.jbuilder diff --git a/app/controllers/access_permissions/protocols_controller.rb b/app/controllers/access_permissions/protocols_controller.rb new file mode 100644 index 000000000..c9562c97a --- /dev/null +++ b/app/controllers/access_permissions/protocols_controller.rb @@ -0,0 +1,99 @@ +# frozen_string_literal: true + +module AccessPermissions + class ProtocolsController < ApplicationController + before_action :set_protocol + before_action :check_read_permissions, only: %i(show) + before_action :check_manage_permissions, except: %i(show) + + def new + respond_to do |format| + format.json + end + end + + def show + respond_to do |format| + format.json + end + end + + def edit + respond_to do |format| + format.json + end + end + + def update + @user_assignment = UserAssignment.find_by(user_id: permitted_update_params[:user_id], assignable: @protocol) + @user_assignment.update(permitted_update_params) + respond_to do |format| + format.json do + render :protocol_member + end + end + end + + def create + respond_to do |format| + if @form.save + @message = t('access_permissions.create.success', count: @form.new_members_count) + format.json { render :edit } + else + @message = t('access_permissions.create.failure') + format.json { render :new } + end + end + end + + def destroy + respond_to do |format| + if project_member.destroy + format.json do + render json: { flash: t('access_permissions.destroy.success', member_name: user.full_name) }, + status: :ok + end + else + format.json do + render json: { flash: t('access_permissions.destroy.failure') }, + status: :unprocessable_entity + end + end + end + end + + def update_default_public_user_role + @protocol.update!(permitted_default_public_user_role_params) + end + + private + + def permitted_default_public_user_role_params + params.require(:protocol).permit(:default_public_user_role_id) + end + + def permitted_update_params + params.require(:user_assignment) + .permit(%i(user_role_id user_id)) + end + + def permitted_create_params + params.require(:access_permissions_new_user_protocol_form) + .permit(resource_members: %i(assign user_id user_role_id)) + end + + def set_protocol + @protocol = current_team.protocols.includes(user_assignments: %i(user user_role)).find_by(id: params[:id]) + + render_404 unless @protocol + end + + def check_manage_permissions + render_403 unless can_manage_protocol_users?(@protocol) + end + + def check_read_permissions + render_403 unless can_read_protocol?(@protocol) + end + end +end diff --git a/app/models/user_assignment.rb b/app/models/user_assignment.rb index 210dd3e0e..969b5da32 100644 --- a/app/models/user_assignment.rb +++ b/app/models/user_assignment.rb @@ -16,6 +16,10 @@ class UserAssignment < ApplicationRecord validates :user, uniqueness: { scope: %i(assignable team_id) } + def last_assignable_owner? + assignable_owners.count == 1 && user_role.owner? + end + private def assign_team_child_objects @@ -29,4 +33,10 @@ class UserAssignment < ApplicationRecord def unassign_team_child_objects UserAssignments::RemoveTeamUserAssignmentsService.new(self).call end + + def assignable_owners + @assignable_owners ||= assignable.user_assignments + .includes(:user_role) + .where(user_roles: { name: I18n.t('user_roles.predefined.owner') }) + end end diff --git a/app/views/access_permissions/partials/_protocol_member_field.html.erb b/app/views/access_permissions/partials/_protocol_member_field.html.erb new file mode 100644 index 000000000..ae047d377 --- /dev/null +++ b/app/views/access_permissions/partials/_protocol_member_field.html.erb @@ -0,0 +1,33 @@ +<% # frozen_string_literal: true %> + +<% + protocol_assignment = UserAssignment.find_by(user_id: user.id, assignable: protocol) + item_id = dom_id(user, :protocol_member) +%> + +<%= form_with(model: protocol_assignment, url: update_path, method: :put, remote: true, html: { class: 'row member-item', id: item_id, data: { action: 'replace-form autosave-form', object_type: :protocol } }) do |f| %> + <%= f.hidden_field :user_id, value: f.object.user.id %> +
+
+ <%= image_tag avatar_path(user, :icon_small), title: current_assignee_name(user), class: 'img-circle pull-left' %> +
+
+ <%= current_assignee_name(user) %> +
+ <%= user_assignment_resource_role_name(user, protocol) %> +
+
+
+
+ <%= f.select :user_role_id, options_for_select(user_roles_collection, selected: f.object.user_role.id), {}, class: 'form-control selectpicker', title: t('user_assignment.change_protocol_role'), data: { 'selected-text-format' => 'static' } %> +
+
+ <% unless protocol_assignment.last_assignable_owner? %> + <%= link_to access_permissions_protocol_path(protocol, user_id: user), remote: true, method: :delete, class: 'btn btn-secondary', data: { action: 'remote-destroy', target: "##{item_id}" } do %> + + <%= t 'general.remove' %> + <% end %> + <% end %> +
+
+<% end %> diff --git a/app/views/access_permissions/partials/_protocol_public_user_role_form.html.erb b/app/views/access_permissions/partials/_protocol_public_user_role_form.html.erb new file mode 100644 index 000000000..a9552df11 --- /dev/null +++ b/app/views/access_permissions/partials/_protocol_public_user_role_form.html.erb @@ -0,0 +1,20 @@ +<%= form_with(model: protocol, url: update_default_public_user_role_access_permissions_protocol_path(protocol), method: :put, remote: true, html: { class: 'row member-item', id: 'public_assignments', data: { action: 'replace-form autosave-form', object_type: :protocol } }) do |f| %> +
+
+ <%= image_tag "icon/team.png", class: 'img-circle pull-left' %> +
+
+ <%= t('access_permissions.everyone_else', team_name: protocol.team.name) %> + <%= render 'access_permissions/partials/public_members_dropdown', team: protocol.team, protocol: protocol %> +
+
+
+
+ <% if editable %> + <%= f.select :default_public_user_role_id, options_for_select(user_roles_collection) {}, class: 'form-control selectpicker', title: t('user_assignment.change_protocol_role'), data: { 'selected-text-format' => 'static' } %> + <% end %> +
+
+
+
+<% end %> diff --git a/app/views/access_permissions/partials/_public_members_dropdown.html.erb b/app/views/access_permissions/partials/_public_members_dropdown.html.erb index dd7c7a362..8022f022b 100644 --- a/app/views/access_permissions/partials/_public_members_dropdown.html.erb +++ b/app/views/access_permissions/partials/_public_members_dropdown.html.erb @@ -5,7 +5,14 @@
<%= t('.title', team: team.name) %>
- <% team.users.order(full_name: :asc).where.not(id: project.manually_assigned_users.select(:id)).each do |user| %> + <% + users_excluded = if defined? project + project.manually_assigned_users.select(:id) + elsif protocol + protocol.manually_assigned_users.select(:id) + end + %> + <% team.users.order(full_name: :asc).where.not(id: users_excluded).each do |user| %>
<%= user.full_name %>
diff --git a/app/views/access_permissions/protocols/edit.json.jbuilder b/app/views/access_permissions/protocols/edit.json.jbuilder new file mode 100644 index 000000000..3cd9a7ec5 --- /dev/null +++ b/app/views/access_permissions/protocols/edit.json.jbuilder @@ -0,0 +1,14 @@ +# frozen_string_literal: true + +json.modal controller.render_to_string( + partial: 'access_permissions/protocols/modals/edit_modal', + formats: [:html], + locals: { + protocol: @protocol, + update_path: access_permissions_protocol_path(@protocol), + new_resource_path: new_access_permissions_protocol_path(id: @protocol) + }, + layout: false +) + +json.flash @message diff --git a/app/views/access_permissions/protocols/modals/_edit_modal.html.erb b/app/views/access_permissions/protocols/modals/_edit_modal.html.erb new file mode 100644 index 000000000..47b6e8492 --- /dev/null +++ b/app/views/access_permissions/protocols/modals/_edit_modal.html.erb @@ -0,0 +1,25 @@ +<% # frozen_string_literal: true %> + + diff --git a/app/views/access_permissions/protocols/modals/_show_modal.html.erb b/app/views/access_permissions/protocols/modals/_show_modal.html.erb new file mode 100644 index 000000000..4edfd3c93 --- /dev/null +++ b/app/views/access_permissions/protocols/modals/_show_modal.html.erb @@ -0,0 +1,19 @@ +<% # frozen_string_literal: true %> + + diff --git a/app/views/access_permissions/protocols/new.json.jbuilder b/app/views/access_permissions/protocols/new.json.jbuilder new file mode 100644 index 000000000..8fd64ccf4 --- /dev/null +++ b/app/views/access_permissions/protocols/new.json.jbuilder @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +json.html controller.render_to_string( + partial: 'access_permissions/partials/new_assignments_form', + formats: [:html], + locals: { + resource: @protocol, + form_object: @form, + create_path: access_permissions_protocol_path(id: @protocol.id), + resource_path: edit_access_permissions_protocol_path(@protocol) + }, + layout: false +) diff --git a/app/views/access_permissions/protocols/protocol_member.json.jbuilder b/app/views/access_permissions/protocols/protocol_member.json.jbuilder new file mode 100644 index 000000000..7024964e9 --- /dev/null +++ b/app/views/access_permissions/protocols/protocol_member.json.jbuilder @@ -0,0 +1,12 @@ +# frozen_string_literal: true + +json.form controller.render_to_string( + partial: 'access_permissions/partials/protocol_member_field', + formats: [:html], + locals: { + user: @user_assignment.user, + protocol: @protocol, + update_path: access_permissions_protocol_path(@protocol) + }, + layout: false +) diff --git a/app/views/access_permissions/protocols/show.json.jbuilder b/app/views/access_permissions/protocols/show.json.jbuilder new file mode 100644 index 000000000..97c1a389c --- /dev/null +++ b/app/views/access_permissions/protocols/show.json.jbuilder @@ -0,0 +1,12 @@ +# frozen_string_literal: true + +json.modal controller.render_to_string( + partial: 'access_permissions/protocols/modals/show_modal', + formats: [:html], + locals: { + protocol: @protocol, + users: @protocol.manually_assigned_users, + can_manage_resource: can_manage_protocol_users?(@protocol) + }, + layout: false +) diff --git a/app/views/access_permissions/protocols/update_default_public_user_role.json.jbuilder b/app/views/access_permissions/protocols/update_default_public_user_role.json.jbuilder new file mode 100644 index 000000000..77e3bb070 --- /dev/null +++ b/app/views/access_permissions/protocols/update_default_public_user_role.json.jbuilder @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +json.form controller.render_to_string( + partial: 'access_permissions/partials/default_public_user_role_form', + formats: [:html], + locals: { + protocol: @protocol, + editable: true + }, + layout: false +) diff --git a/config/locales/en.yml b/config/locales/en.yml index c40e6c62e..54d85b8e0 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -3036,6 +3036,7 @@ en: user_assignment: current_assignee: "(you)" change_project_role: "Change project role" + change_protocol_role: "Change protocol role" select_default_user_role: "Select default user role" change_experiment_role: "Change experiment role" change_my_module_role: "Change task role" @@ -3078,6 +3079,9 @@ en: project: "Project" project_tooltip: "This role was set on this project." project_tooltip_inherit: "This role was inherited from the project." + protocol: "Protocol" + protocol_tooltip: "This role was set on this protocol." + protocol_tooltip_inherit: "This role was inherited from the protocol." experiment: "Experiment" experiment_tooltip: "This role was set on this experiment." experiment_tooltip_inherit: "This role was inherited from the experiment." @@ -3091,6 +3095,14 @@ en: show_modal: title: "Access to %{resource_name}" new_resource_assignments: "Grant new access to %{resource}" + protocols: + modals: + show_modal: + title: "Access to %{resource_name}" + new_resource_assignments: "Grant new access to %{resource}" + edit_modal: + title: "Manage access for %{resource_name}" + new_resource_assignments: "Grant new access to %{resource}" experiments: modals: show_modal: diff --git a/config/routes.rb b/config/routes.rb index 8c4daea22..0c0b96966 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -280,6 +280,9 @@ Rails.application.routes.draw do end namespace :access_permissions do + resources :protocols, defaults: { format: 'json' } do + put :update_default_public_user_role, on: :member + end resources :projects, defaults: { format: 'json' } do put :update_default_public_user_role, on: :member resources :experiments, only: %i(show update edit) do From 9c488d5a0c6c5a6a8d4a114825c8be6accbd9b5a Mon Sep 17 00:00:00 2001 From: Anton Date: Tue, 3 Jan 2023 14:43:03 +0100 Subject: [PATCH 2/3] Add new access user modal [SCI-7518] --- .../access_permissions/projects.js | 2 +- .../protocols_controller.rb | 35 ++++++++++-------- app/helpers/user_assignments_helper.rb | 2 +- app/models/concerns/assignable.rb | 4 +++ app/models/user_assignment.rb | 2 ++ .../_new_protocol_assignments_form.html.erb | 29 +++++++++++++++ .../_protocol_public_user_role_form.html.erb | 20 ----------- .../_protocol_user_assignment_field.html.erb | 36 +++++++++++++++++++ .../protocols/modals/_edit_modal.html.erb | 3 +- .../protocols/modals/_show_modal.html.erb | 1 - .../protocols/new.json.jbuilder | 7 ++-- .../protocols/show.json.jbuilder | 2 +- ...ate_default_public_user_role.json.jbuilder | 11 ------ config/locales/en.yml | 6 ++++ config/routes.rb | 4 +-- 15 files changed, 107 insertions(+), 57 deletions(-) create mode 100644 app/views/access_permissions/partials/_new_protocol_assignments_form.html.erb delete mode 100644 app/views/access_permissions/partials/_protocol_public_user_role_form.html.erb create mode 100644 app/views/access_permissions/partials/_protocol_user_assignment_field.html.erb delete mode 100644 app/views/access_permissions/protocols/update_default_public_user_role.json.jbuilder diff --git a/app/assets/javascripts/access_permissions/projects.js b/app/assets/javascripts/access_permissions/projects.js index 8e1a7354d..c2eecd7ae 100644 --- a/app/assets/javascripts/access_permissions/projects.js +++ b/app/assets/javascripts/access_permissions/projects.js @@ -2,7 +2,7 @@ 'use strict'; function initNewUserAssignmentFormListener() { - $(document).on('change', 'form#new-user-assignment-to-project-form', function() { + $(document).on('change', 'form#new-user-assignment-to-project-form, form#new-user-assignment-to-protocol-form', function() { let values = []; let count = 0; let submitBtn = $(this).find('input[type="submit"]'); diff --git a/app/controllers/access_permissions/protocols_controller.rb b/app/controllers/access_permissions/protocols_controller.rb index c9562c97a..d8a2f4344 100644 --- a/app/controllers/access_permissions/protocols_controller.rb +++ b/app/controllers/access_permissions/protocols_controller.rb @@ -7,6 +7,8 @@ module AccessPermissions before_action :check_manage_permissions, except: %i(show) def new + @user_assignment = UserAssignment.new(assignable: @project, assigned_by: current_user) + respond_to do |format| format.json end @@ -35,11 +37,22 @@ module AccessPermissions end def create - respond_to do |format| - if @form.save - @message = t('access_permissions.create.success', count: @form.new_members_count) + ActiveRecord::Base.transaction do + 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_by = current_user + user_assignment.save! + end + + respond_to do |format| + @message = t('access_permissions.create.success', count: @protocol.user_assignments.count) format.json { render :edit } - else + end + rescue ActiveRecord::RecordInvalid + respond_to do |format| @message = t('access_permissions.create.failure') format.json { render :new } end @@ -47,8 +60,10 @@ module AccessPermissions end def destroy + user = @protocol.assigned_users.find(params[:user_id]) + user_assignment = @protocol.user_assignments.find_by(user_id: params[:user_id]) respond_to do |format| - if project_member.destroy + if user_assignment.destroy format.json do render json: { flash: t('access_permissions.destroy.success', member_name: user.full_name) }, status: :ok @@ -62,16 +77,8 @@ module AccessPermissions end end - def update_default_public_user_role - @protocol.update!(permitted_default_public_user_role_params) - end - private - def permitted_default_public_user_role_params - params.require(:protocol).permit(:default_public_user_role_id) - end - def permitted_update_params params.require(:user_assignment) .permit(%i(user_role_id user_id)) @@ -93,7 +100,7 @@ module AccessPermissions end def check_read_permissions - render_403 unless can_read_protocol?(@protocol) + render_403 unless can_read_protocol_in_repository?(@protocol) end end end diff --git a/app/helpers/user_assignments_helper.rb b/app/helpers/user_assignments_helper.rb index be0731d3d..c5167bd5a 100644 --- a/app/helpers/user_assignments_helper.rb +++ b/app/helpers/user_assignments_helper.rb @@ -12,7 +12,7 @@ module UserAssignmentsHelper def user_assignment_resource_role_name(user, resource, inherit = '') user_assignment = resource.user_assignments.find_by(user: user) - if resource.class != Project && user_assignment.automatically_assigned? + if ![Project, Protocol].include?(resource.class) && user_assignment.automatically_assigned? parent = resource.permission_parent return user_assignment_resource_role_name(user, parent, '_inherit') end diff --git a/app/models/concerns/assignable.rb b/app/models/concerns/assignable.rb index 59960e30a..00b3f228f 100644 --- a/app/models/concerns/assignable.rb +++ b/app/models/concerns/assignable.rb @@ -42,6 +42,10 @@ module Assignable User.joins(:user_assignments).where(user_assignments: { assigned: :manually, assignable: self }) end + def assigned_users + User.joins(:user_assignments).where(user_assignments: { assignable: self }) + end + private def create_users_assignments diff --git a/app/models/user_assignment.rb b/app/models/user_assignment.rb index 969b5da32..fa09bd1a7 100644 --- a/app/models/user_assignment.rb +++ b/app/models/user_assignment.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true class UserAssignment < ApplicationRecord + attr_accessor :assign + before_validation -> { self.team ||= (assignable.is_a?(Team) ? assignable : assignable.team) } after_create :assign_team_child_objects, if: -> { assignable.is_a?(Team) } after_update :update_team_children_assignments, if: -> { assignable.is_a?(Team) && saved_change_to_user_role_id? } diff --git a/app/views/access_permissions/partials/_new_protocol_assignments_form.html.erb b/app/views/access_permissions/partials/_new_protocol_assignments_form.html.erb new file mode 100644 index 000000000..a049f22f6 --- /dev/null +++ b/app/views/access_permissions/partials/_new_protocol_assignments_form.html.erb @@ -0,0 +1,29 @@ +<% # frozen_string_literal: true %> + +
+
+ +

+ <%= link_to resource_path, remote: true, class: 'pull-left spacer', data: { action: 'swap-remote-container', target: '#user_assignments_modal' } do %> + + <% end %> + <%= t '.title', resource_name: resource.name %> +

+
+ <%= form_with(url: create_path, method: :post, remote: true, html: { id: 'new-user-assignment-to-protocol-form', data: { action: 'replace-form', target: '#user_assignments_modal', object_type: resource.class.to_s.downcase} }) do |f| %> +
+
+ <%= 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' } %> + +
+ <% users.each do |user| %> + <%= f.fields_for :users, UserAssignment.new(user: user) do |user_form| %> + <%= render 'access_permissions/partials/protocol_user_assignment_field.html.erb', user_form: user_form %> + <% end %> + <% end %> +
+
+ <%= f.submit t('.submit'), class: "btn btn-primary", disabled: true, data: { 'label-default' => t('.submit'), 'label-singular' => t('.submit_singular'), 'label-plural' => t('.submit_plural') }%> +
+ <% end %> +
diff --git a/app/views/access_permissions/partials/_protocol_public_user_role_form.html.erb b/app/views/access_permissions/partials/_protocol_public_user_role_form.html.erb deleted file mode 100644 index a9552df11..000000000 --- a/app/views/access_permissions/partials/_protocol_public_user_role_form.html.erb +++ /dev/null @@ -1,20 +0,0 @@ -<%= form_with(model: protocol, url: update_default_public_user_role_access_permissions_protocol_path(protocol), method: :put, remote: true, html: { class: 'row member-item', id: 'public_assignments', data: { action: 'replace-form autosave-form', object_type: :protocol } }) do |f| %> -
-
- <%= image_tag "icon/team.png", class: 'img-circle pull-left' %> -
-
- <%= t('access_permissions.everyone_else', team_name: protocol.team.name) %> - <%= render 'access_permissions/partials/public_members_dropdown', team: protocol.team, protocol: protocol %> -
-
-
-
- <% if editable %> - <%= f.select :default_public_user_role_id, options_for_select(user_roles_collection) {}, class: 'form-control selectpicker', title: t('user_assignment.change_protocol_role'), data: { 'selected-text-format' => 'static' } %> - <% end %> -
-
-
-
-<% end %> diff --git a/app/views/access_permissions/partials/_protocol_user_assignment_field.html.erb b/app/views/access_permissions/partials/_protocol_user_assignment_field.html.erb new file mode 100644 index 000000000..6ff5e9ac0 --- /dev/null +++ b/app/views/access_permissions/partials/_protocol_user_assignment_field.html.erb @@ -0,0 +1,36 @@ +<% # frozen_string_literal: true %> + +<% + user = user_form.object.user + id = dom_id(user, :new_protocol_member) +%> + +
+ <%= user_form.hidden_field :user_id, value: user.id, name:"access_permissions_new_user_protocol_form[resource_members][#{user.id}][user_id]" %> +
+
+ <%= user_form.check_box :assign, + name: "access_permissions_new_user_protocol_form[resource_members][#{user.id}][assign]", + data: { action: 'toggle-visibility', target: id }, + class: "sci-checkbox" + %> + +
+
+ <%= image_tag avatar_path(user, :icon_small), title: current_assignee_name(user), class: 'img-circle pull-left' %> +
+
+ <%= current_assignee_name(user) %> +
+
+
+ +
+
diff --git a/app/views/access_permissions/protocols/modals/_edit_modal.html.erb b/app/views/access_permissions/protocols/modals/_edit_modal.html.erb index 47b6e8492..c081e8fdf 100644 --- a/app/views/access_permissions/protocols/modals/_edit_modal.html.erb +++ b/app/views/access_permissions/protocols/modals/_edit_modal.html.erb @@ -8,10 +8,9 @@

<%= t '.title', resource_name: protocol.name %>

- <% protocol.manually_assigned_users.order(full_name: :asc).each do |user| %> + <% protocol.assigned_users.order(full_name: :asc).each do |user| %> <%= render('access_permissions/partials/protocol_member_field', user: user, protocol: protocol, update_path: update_path) %> <% end %> - <%= render('access_permissions/partials/protocol_public_user_role_form', protocol: protocol, editable: true) %>
diff --git a/app/views/access_permissions/protocols/modals/_show_modal.html.erb b/app/views/access_permissions/protocols/modals/_show_modal.html.erb index 4edfd3c93..371f4e0ae 100644 --- a/app/views/access_permissions/protocols/modals/_show_modal.html.erb +++ b/app/views/access_permissions/protocols/modals/_show_modal.html.erb @@ -12,7 +12,6 @@ <% 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 %> - <%= render('access_permissions/partials/default_public_user_role_form', protocol: protocol, editable: false) if protocol.visible? %>
diff --git a/app/views/access_permissions/protocols/new.json.jbuilder b/app/views/access_permissions/protocols/new.json.jbuilder index 8fd64ccf4..f0796a3de 100644 --- a/app/views/access_permissions/protocols/new.json.jbuilder +++ b/app/views/access_permissions/protocols/new.json.jbuilder @@ -1,12 +1,13 @@ # frozen_string_literal: true json.html controller.render_to_string( - partial: 'access_permissions/partials/new_assignments_form', + partial: 'access_permissions/partials/new_protocol_assignments_form', formats: [:html], locals: { resource: @protocol, - form_object: @form, - create_path: access_permissions_protocol_path(id: @protocol.id), + 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) }, layout: false diff --git a/app/views/access_permissions/protocols/show.json.jbuilder b/app/views/access_permissions/protocols/show.json.jbuilder index 97c1a389c..faedde483 100644 --- a/app/views/access_permissions/protocols/show.json.jbuilder +++ b/app/views/access_permissions/protocols/show.json.jbuilder @@ -5,7 +5,7 @@ json.modal controller.render_to_string( formats: [:html], locals: { protocol: @protocol, - users: @protocol.manually_assigned_users, + users: @protocol.assigned_users, can_manage_resource: can_manage_protocol_users?(@protocol) }, layout: false diff --git a/app/views/access_permissions/protocols/update_default_public_user_role.json.jbuilder b/app/views/access_permissions/protocols/update_default_public_user_role.json.jbuilder deleted file mode 100644 index 77e3bb070..000000000 --- a/app/views/access_permissions/protocols/update_default_public_user_role.json.jbuilder +++ /dev/null @@ -1,11 +0,0 @@ -# frozen_string_literal: true - -json.form controller.render_to_string( - partial: 'access_permissions/partials/default_public_user_role_form', - formats: [:html], - locals: { - protocol: @protocol, - editable: true - }, - layout: false -) diff --git a/config/locales/en.yml b/config/locales/en.yml index 54d85b8e0..f6ddb8db4 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -3070,6 +3070,12 @@ en: submit_singular: "Grant access to 1 user" submit_plural: "Grant access to {num} users" find_people_html: "Find people" + new_protocol_assignments_form: + title: "Select members" + submit: "Grant access" + submit_singular: "Grant access to 1 user" + submit_plural: "Grant access to {num} users" + find_people_html: "Find people" experiment_member_field: reset: "Inherit role" reset_description: "The inherited role from project will be applied" diff --git a/config/routes.rb b/config/routes.rb index 0c0b96966..ad1996c64 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -280,9 +280,7 @@ Rails.application.routes.draw do end namespace :access_permissions do - resources :protocols, defaults: { format: 'json' } do - put :update_default_public_user_role, on: :member - end + 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 From 2e8a02f79f2be6b70fe54a4b8ad51a7a36ab75c0 Mon Sep 17 00:00:00 2001 From: Anton Date: Wed, 18 Jan 2023 14:18:06 +0100 Subject: [PATCH 3/3] Fix markup --- .../{projects.js => user_assignments.js} | 0 .../partials/_default_public_user_role_form.html.erb | 2 +- .../partials/_public_members_dropdown.html.erb | 10 ++-------- 3 files changed, 3 insertions(+), 9 deletions(-) rename app/assets/javascripts/access_permissions/{projects.js => user_assignments.js} (100%) diff --git a/app/assets/javascripts/access_permissions/projects.js b/app/assets/javascripts/access_permissions/user_assignments.js similarity index 100% rename from app/assets/javascripts/access_permissions/projects.js rename to app/assets/javascripts/access_permissions/user_assignments.js diff --git a/app/views/access_permissions/partials/_default_public_user_role_form.html.erb b/app/views/access_permissions/partials/_default_public_user_role_form.html.erb index 1e13d77b8..96f9a9d8e 100644 --- a/app/views/access_permissions/partials/_default_public_user_role_form.html.erb +++ b/app/views/access_permissions/partials/_default_public_user_role_form.html.erb @@ -5,7 +5,7 @@
<%= t('access_permissions.everyone_else', team_name: project.team.name) %> - <%= render 'access_permissions/partials/public_members_dropdown', team: project.team, project: project %> + <%= render 'access_permissions/partials/public_members_dropdown', team: project.team, assignable: project %>
<%= project.default_public_user_role.name %> diff --git a/app/views/access_permissions/partials/_public_members_dropdown.html.erb b/app/views/access_permissions/partials/_public_members_dropdown.html.erb index 8022f022b..16c32b32b 100644 --- a/app/views/access_permissions/partials/_public_members_dropdown.html.erb +++ b/app/views/access_permissions/partials/_public_members_dropdown.html.erb @@ -5,14 +5,8 @@
<%= t('.title', team: team.name) %>
- <% - users_excluded = if defined? project - project.manually_assigned_users.select(:id) - elsif protocol - protocol.manually_assigned_users.select(:id) - end - %> - <% team.users.order(full_name: :asc).where.not(id: users_excluded).each do |user| %> + <% users_excluded_id = assignable.manually_assigned_users.select(:id) %> + <% team.users.order(full_name: :asc).where.not(id: users_excluded_id).each do |user| %>
<%= user.full_name %>