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

Made having a confirmed email not required to view edit pages.

Browse Source
This commit is contained in:
Logan Fick
2017-11-11 19:53:51 -05:00
parent ec085121a4
commit 780598ca6d
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/forumgroups_controller.rb
View File

@@ -9,7 +9,7 @@ class ForumgroupsController < ApplicationController
end end
def edit def edit
if admin? && current_user.confirmed? if admin?
@group = Forumgroup.find(params[:id]) @group = Forumgroup.find(params[:id])
else else
flash[:alert] = "You are not allowed to edit forum groups." flash[:alert] = "You are not allowed to edit forum groups."
@@ -32,7 +32,7 @@ class ForumgroupsController < ApplicationController
end end
def new def new
if admin? && current_user.confirmed? if admin?
@group = Forumgroup.new @group = Forumgroup.new
else else
flash[:alert] = "You are not allowed to create forum groups." flash[:alert] = "You are not allowed to create forum groups."

6
app/controllers/users_controller.rb
View File

@@ -223,21 +223,21 @@ class UsersController < ApplicationController
end end
def edit_notifications 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!" flash[:alert] = "You are not allowed to edit this user's notification settings!"
redirect_to @user redirect_to @user
end end
end end
def edit_login 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!" flash[:alert] = "You are not allowed to edit this user's login details!"
redirect_to @user redirect_to @user
end end
end end
def edit_website_settings 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!" flash[:alert] = "You are not allowed to edit this user's website settings!"
redirect_to @user redirect_to @user
end end