diff --git a/app/controllers/access_permissions/base_controller.rb b/app/controllers/access_permissions/base_controller.rb index d45651b9e..922f47976 100644 --- a/app/controllers/access_permissions/base_controller.rb +++ b/app/controllers/access_permissions/base_controller.rb @@ -75,6 +75,8 @@ module AccessPermissions end propagate_job + + render json: { user_role_id: @assignment.user_role_id }, status: :ok rescue ActiveRecord::RecordInvalid render json: { flash: t('access_permissions.update.failure') }, status: :unprocessable_entity end diff --git a/app/controllers/access_permissions/experiments_controller.rb b/app/controllers/access_permissions/experiments_controller.rb index 6199c5f89..0f661007e 100644 --- a/app/controllers/access_permissions/experiments_controller.rb +++ b/app/controllers/access_permissions/experiments_controller.rb @@ -7,7 +7,7 @@ module AccessPermissions def update if permitted_params[:user_role_id] == 'reset' parent_assignment = @project.public_send(:"#{assignment_type}_assignments").find_or_initialize_by( - "#{assignment_type}_id": permitted_params[:"#{assignment_type}_id"], + "#{assignment_type}_id": permitted_params[:"#{assignment_type}_id"] || current_team.id, team: current_team ) @@ -35,7 +35,7 @@ module AccessPermissions log_activity(:change_user_role_on_experiment, user_target: @assignment.user.id, role: @assignment.user_role.name) end - render json: {}, status: :ok + render json: { user_role_id: @assignment.user_role_id }, status: :ok end private diff --git a/app/controllers/access_permissions/my_modules_controller.rb b/app/controllers/access_permissions/my_modules_controller.rb index c1e57c663..62cc95a0c 100644 --- a/app/controllers/access_permissions/my_modules_controller.rb +++ b/app/controllers/access_permissions/my_modules_controller.rb @@ -8,7 +8,7 @@ module AccessPermissions def update if permitted_params[:user_role_id] == 'reset' parent_assignment = @experiment.public_send(:"#{assignment_type}_assignments").find_or_initialize_by( - "#{assignment_type}_id": permitted_params[:"#{assignment_type}_id"], + "#{assignment_type}_id": permitted_params[:"#{assignment_type}_id"] || current_team.id, team: current_team ) @@ -33,6 +33,8 @@ module AccessPermissions when :user log_activity(:change_user_role_on_my_module, user_target: @assignment.user.id, role: @assignment.user_role.name) end + + render json: { user_role_id: @assignment.user_role_id }, status: :ok end private diff --git a/app/javascript/vue/shared/access_modal/edit.vue b/app/javascript/vue/shared/access_modal/edit.vue index be47e43e1..f08912668 100644 --- a/app/javascript/vue/shared/access_modal/edit.vue +++ b/app/javascript/vue/shared/access_modal/edit.vue @@ -329,7 +329,7 @@ export default { if (!roleId) { this.$emit('changeVisibility', false, null); } else { - this.$emit('changeVisibility', true, roleId); + this.$emit('changeVisibility', true, response.data.user_role_id); } if (response.data.message) { HelperModule.flashAlertMsg(response.data.message, 'success');