diff options
| author | Logan Fick <logaldeveloper@protonmail.com> | 2017-11-11 19:53:51 -0500 |
|---|---|---|
| committer | Logan Fick <logaldeveloper@protonmail.com> | 2017-11-11 19:53:51 -0500 |
| commit | 780598ca6d53ce9caeecd41503a176fdc7ab0dcc (patch) | |
| tree | cabb2fc85168af2a9764e78eec67d8dd379f5e9c | |
| parent | ec085121a4c3068eb6ca6467f5d079064baf981a (diff) | |
Made having a confirmed email not required to view edit pages.
| -rw-r--r-- | app/controllers/forumgroups_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/users_controller.rb | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/controllers/forumgroups_controller.rb b/app/controllers/forumgroups_controller.rb index 3e53b4a..0a45ca6 100644 --- a/app/controllers/forumgroups_controller.rb +++ b/app/controllers/forumgroups_controller.rb @@ -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." diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 9c21b4a..9049587 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -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 |