Redstoner/redstoner.com
Archived
0
Fork 0
Code Issues Pull Requests 2 Wiki Activity

fixed role bug

Browse Source
This commit is contained in:
jomo
2014-05-01 20:14:42 +02:00
parent d64e539c76
commit c2b9b1fdd7
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/users_controller.rb
View File

@@ -129,14 +129,14 @@ class UsersController < ApplicationController
def update def update
@user = User.find(params[:id]) @user = User.find(params[:id])
if (mod? && current_user.role >= @user.role ) || (@user.is?(current_user) && confirmed?) if (mod? && current_user.role >= @user.role ) || (@user.is?(current_user) && confirmed?)
userdata = user_params([:name, :role_id, :skype, :skype_public, :youtube, :twitter, :about]) userdata = user_params([:name, :role, :skype, :skype_public, :youtube, :twitter, :about])
if userdata[:role_id] if userdata[:role]
role = Role.find(userdata[:role_id]) role = Role.get(userdata[:role])
if (mod? && role <= current_user.role) if (mod? && role <= current_user.role)
userdata[:role_id] = role.id userdata[:role] = role
else else
#reset role #reset role
userdata[:role_id] = @user.role.id userdata.delete[:role]
end end
end end
unless userdata[:ign] && (mod? && current_user.role >= @user.role) unless userdata[:ign] && (mod? && current_user.role >= @user.role)