diff --git a/app/assets/stylesheets/access_permissions/access_modal.scss b/app/assets/stylesheets/access_permissions/access_modal.scss index d83980af2..20b2b333a 100644 --- a/app/assets/stylesheets/access_permissions/access_modal.scss +++ b/app/assets/stylesheets/access_permissions/access_modal.scss @@ -10,6 +10,15 @@ &:focus { box-shadow: none; } + + &.disabled { + color: $color-black; + opacity: 1; + + .caret { + opacity: 0; + } + } } .modal-body { diff --git a/app/controllers/access_permissions/projects_controller.rb b/app/controllers/access_permissions/projects_controller.rb index 57ae09775..4f55863c0 100644 --- a/app/controllers/access_permissions/projects_controller.rb +++ b/app/controllers/access_permissions/projects_controller.rb @@ -38,7 +38,7 @@ module AccessPermissions @user_assignment.update!(permitted_update_params) log_activity(:change_user_role_on_project, @user_assignment) - propagate_job(user_assignment) + propagate_job(@user_assignment) respond_to do |format| format.json do diff --git a/app/views/access_permissions/my_modules/my_module_member.json.jbuilder b/app/views/access_permissions/my_modules/my_module_member.json.jbuilder index a250dbeae..43b413999 100644 --- a/app/views/access_permissions/my_modules/my_module_member.json.jbuilder +++ b/app/views/access_permissions/my_modules/my_module_member.json.jbuilder @@ -5,7 +5,7 @@ json.form controller.render_to_string( formats: [:html], locals: { user: @user_assignment.user, - update_path: access_permissions_my_module_path(@my_module) + update_path: access_permissions_my_module_path(@my_module), with_inherit: true, assignable: @my_module }, 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 2fa1254ec..e6aa3dac8 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 @@ -1,3 +1,4 @@ +<% editable ||= false %> <% if assignable.visible? %> <%= form_with(model: assignable, url: [:update_default_public_user_role, :access_permissions, assignable], method: :put, remote: true, html: { class: 'member-item', id: 'public_assignments', data: { action: 'replace-form autosave-form', object_type: assignable.class.name.underscore.to_sym } }) do |f| %>