Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor refactor of Users controller, using User's new methods to check… #2508

Merged
merged 1 commit into from
Mar 21, 2018
Merged

Minor refactor of Users controller, using User's new methods to check… #2508

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/controllers/users_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def list
.order(order_string)
.page(params[:page])
end
@users = @users.where('users.status = 1') unless current_user && (current_user.role == "admin" || current_user.role == "moderator")
@users = @users.where('users.status = 1') unless current_user && (current_user.can_moderate?)
end

def profile
Expand Down Expand Up @@ -165,7 +165,7 @@ def profile
end

if @user.status == 0
if current_user && (current_user.role == "admin" || current_user.role == "moderator")
if current_user && (current_user.can_moderate?)
flash.now[:error] = I18n.t('users_controller.user_has_been_banned')
else
flash[:error] = I18n.t('users_controller.user_has_been_banned')
Expand Down Expand Up @@ -259,7 +259,7 @@ def comments

def photo
@user = DrupalUser.find_by(uid: params[:uid]).user
if current_user.uid == @user.uid || current_user.role == "admin"
if current_user.uid == @user.uid || current_user.admin?
@user.photo = params[:photo]
if @user.save!
if request.xhr?
Expand Down