Sutty/panel
5
0
Fork 0
mirror of https://0xacab.org/sutty/sutty synced 2025-02-23 11:51:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'issue-12754' into panel.sutty.nl

Browse source
This commit is contained in:
f 2023-03-23 17:42:34 -03:00
commit 4e7b49b020
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/controllers/usuaries_controller.rb
View file

@ -47,7 +47,7 @@ class UsuariesController < ApplicationController
@usuarie = Usuarie.find(params[:usuarie_id])
if @site.usuaries.count > 1
@usuarie.rol_for_site(@site).update_attribute :rol, 'invitade'
@usuarie.rol_for_site(@site).update_attribute :rol, Rol::INVITADE
else
flash[:warning] = I18n.t('usuaries.index.demote.denied')
end
@ -61,7 +61,7 @@ class UsuariesController < ApplicationController
authorize SiteUsuarie.new(@site, current_usuarie)
@usuarie = Usuarie.find(params[:usuarie_id])
@usuarie.rol_for_site(@site).update_attribute :rol, 'usuarie'
@usuarie.rol_for_site(@site).update_attribute :rol, Rol::USUARIE
redirect_to site_usuaries_path
end
@ -72,7 +72,7 @@ class UsuariesController < ApplicationController
site_usuarie = SiteUsuarie.new(@site, current_usuarie)
authorize site_usuarie
params[:invited_as] = Rol::INVITADE unless Rol.role? params[:invited_as]
params[:invite_as] = invited_as :invite_as
@policy = policy(site_usuarie)
end
@ -158,12 +158,10 @@ class UsuariesController < ApplicationController
# El tipo de invitación que tenemos que enviar, si alguien mandó
# cualquier cosa, usamos el privilegio menor.
def invited_as
if Rol::ROLES.include?(params[:invited_as])
params[:invited_as]
else
'invitade'
end
#
# @return [String]
def invited_as(param_key = :invited_as)
Rol.role?(params[param_key]) ? params[param_key] : Rol::INVITADE
end
def site