Made having a confirmed email not required to view edit pages.
This commit is contained in:
@@ -9,7 +9,7 @@ class ForumgroupsController < ApplicationController
|
||||
end
|
||||
|
||||
def edit
|
||||
if admin? && current_user.confirmed?
|
||||
if admin?
|
||||
@group = Forumgroup.find(params[:id])
|
||||
else
|
||||
flash[:alert] = "You are not allowed to edit forum groups."
|
||||
@@ -32,7 +32,7 @@ class ForumgroupsController < ApplicationController
|
||||
end
|
||||
|
||||
def new
|
||||
if admin? && current_user.confirmed?
|
||||
if admin?
|
||||
@group = Forumgroup.new
|
||||
else
|
||||
flash[:alert] = "You are not allowed to create forum groups."
|
||||
|
||||
@@ -223,21 +223,21 @@ class UsersController < ApplicationController
|
||||
end
|
||||
|
||||
def edit_notifications
|
||||
unless @user.is?(current_user) || (admin? && current_user.role > @user.role && current_user.confirmed?) || (superadmin? && current_user.confirmed?)
|
||||
unless @user.is?(current_user) || (admin? && current_user.role > @user.role) || superadmin?
|
||||
flash[:alert] = "You are not allowed to edit this user's notification settings!"
|
||||
redirect_to @user
|
||||
end
|
||||
end
|
||||
|
||||
def edit_login
|
||||
unless @user.is?(current_user) || (admin? && current_user.role > @user.role && current_user.confirmed?) || (superadmin? && current_user.confirmed?)
|
||||
unless @user.is?(current_user) || (admin? && current_user.role > @user.role) || superadmin?
|
||||
flash[:alert] = "You are not allowed to edit this user's login details!"
|
||||
redirect_to @user
|
||||
end
|
||||
end
|
||||
|
||||
def edit_website_settings
|
||||
unless @user.is?(current_user) || (admin? && current_user.role > @user.role && current_user.confirmed?) || (superadmin? && current_user.confirmed?)
|
||||
unless @user.is?(current_user) || (admin? && current_user.role > @user.role) || superadmin?
|
||||
flash[:alert] = "You are not allowed to edit this user's website settings!"
|
||||
redirect_to @user
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user