some New and some old

Added some new stuff (mainly the fix for the "new" ranks suffixes) and
removed some uneeded bits.
Also changed the gemfile so it will work on Windows too.
This commit is contained in:
Jonas Folvik
2016-01-11 18:21:21 +01:00
parent d9b971ab34
commit c35a36a5c5
9 changed files with 138 additions and 125 deletions
+9 -9
View File
@@ -17,9 +17,9 @@ class ApplicationController < ActionController::Base
helper_method :superadmin?
helper_method :donor?
helper_method :retired?
helper_method :developer?
helper_method :trainingmod?
helper_method :lead_mod?
helper_method :mit?
helper_method :dev?
helper_method :lead?
helper_method :confirmed?
@@ -79,16 +79,16 @@ class ApplicationController < ActionController::Base
!!(current_user && current_user.retired?)
end
def developer?
!!(current_user && current_user.developer?)
def mit?
!!(current_user && current_user.mit?)
end
def trainingmod?
!!(current_user && current_user.trainingmod?)
def dev?
!!(current_user && current_user.dev?)
end
def lead_mod?
!!(current_user && current_user.lead_mod?)
def lead?
!!(current_user && current_user.lead?)
end
def confirmed?
+9 -1
View File
@@ -12,6 +12,14 @@ class UsersController < ApplicationController
@users = User.joins(:role).where("roles.value >= ?", Role.get(:mod).to_i)
elsif params[:role].downcase == "donor"
@users = User.joins(:role).where(donor: true)
elsif params[:role].downcase == "retired"
@users = User.joins(:role).where(retired: true)
elsif params[:role].downcase == "mit"
@users = User.joins(:role).where(mit: true)
elsif params[:role].downcase == "dev"
@users = User.joins(:role).where(dev: true)
elsif params[:role].downcase == "lead"
@users = User.joins(:role).where(lead: true)
else
if role = Role.get(params[:role])
@users = User.joins(:role).where(role: role)
@@ -140,7 +148,7 @@ class UsersController < ApplicationController
def update
if (mod? && current_user.role >= @user.role ) || (@user.is?(current_user) && confirmed?)
if mod?
userdata = user_params([:name, :skype, :skype_public, :youtube, :twitter, :about, :role, :confirmed, :donor])
userdata = user_params([:name, :skype, :skype_public, :youtube, :twitter, :about, :role, :confirmed, :donor, :retired, :dev, :mit, :lead])
else
userdata = user_params([:name, :skype, :skype_public, :youtube, :twitter, :about])
end