mirrors/retrospring
1
0
Fork 0
mirror of https://github.com/Retrospring/retrospring.git synced 2024-11-20 14:39:52 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix not being able to unset administrator privileges in UI

Browse source
This commit is contained in:
Andreas Nedbal 2024-02-28 00:35:25 +01:00 • committed by Andreas Nedbal
parent d87a4adf96
commit 2db1d998b7
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/ajax/moderation_controller.rb
View file

@ -84,7 +84,7 @@ class Ajax::ModerationController < AjaxController
target_user = User.find_by_screen_name!(params[:user])
@response[:message] = t(".error")
return unless %w(moderator admin).include? params[:type].downcase
return unless %w(moderator administrator).include? params[:type].downcase
unless current_user.has_cached_role?(:administrator)
@response[:status] = :nopriv
@ -94,7 +94,7 @@ class Ajax::ModerationController < AjaxController
@response[:checked] = status
type = params[:type].downcase
target_role = {'admin' => 'administrator'}.fetch(type, type).to_sym
target_role = type.to_sym
if status
target_user.add_role target_role

2
app/views/modal/_privileges.html.haml
View file

@ -9,6 +9,6 @@
%ul.list-group
- if current_user.has_cached_role?(:administrator)
= render "modal/privileges/item", privilege: "moderator", description: t(".role.moderator"), user: user
= render "modal/privileges/item", privilege: "admin", description: t(".role.admin"), user: user
= render "modal/privileges/item", privilege: "administrator", description: t(".role.admin"), user: user
.modal-footer
%button.btn.btn-primary{ name: "checked-privileges", type: :button, data: { bs_dismiss: :modal } }= t("voc.close")

5
app/views/modal/privileges/_item.html.haml
View file

@ -1,12 +1,9 @@
:ruby
description ||= ""
role_mapping = { admin: "administrator" }
requires_role = %w[admin moderator].include?(privilege)
checked = requires_role ? user.has_cached_role?(role_mapping.fetch(privilege, privilege).to_sym) : user.public_send("#{privilege}?")
%li.list-group-item{ id: "privilege-#{privilege}" }
.d-flex
.flex-shrink-0
%input{ type: :checkbox, name: "check-your-privileges", data: { type: privilege, user: user.screen_name }, checked: checked, autocomplete: :off }
%input{ type: :checkbox, name: "check-your-privileges", data: { type: privilege, user: user.screen_name }, checked: user.has_cached_role?(privilege.to_sym), autocomplete: :off }
.flex-grow-1
.list-group-item-heading= privilege.capitalize
- unless description.blank?