jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactor post_approvers_only to approver_only.

Browse Source 
Don't duplicate code with post_approvers_only; use the approver_only?
method dynamically defined in `User::Roles.each do ... end`.
This commit is contained in:
evazion
2016-10-14 05:04:40 +00:00
parent d84184b5f1
commit bd6ebceda3
6 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/application_controller.rb
View File

@@ -174,13 +174,4 @@ protected
Rails.application.config.session_store :cookie_store, :key => '_danbooru_session', :secure => false Rails.application.config.session_store :cookie_store, :key => '_danbooru_session', :secure => false
end end
end end
def post_approvers_only
if CurrentUser.can_approve_posts?
true
else
access_denied()
false
end
end
end end

2
app/controllers/moderator/post/approvals_controller.rb
View File

@@ -1,7 +1,7 @@
module Moderator module Moderator
module Post module Post
class ApprovalsController < ApplicationController class ApprovalsController < ApplicationController
before_filter :post_approvers_only before_filter :approver_only
def create def create
cookies.permanent[:moderated] = Time.now.to_i cookies.permanent[:moderated] = Time.now.to_i

2
app/controllers/moderator/post/disapprovals_controller.rb
View File

@@ -1,7 +1,7 @@
module Moderator module Moderator
module Post module Post
class DisapprovalsController < ApplicationController class DisapprovalsController < ApplicationController
before_filter :post_approvers_only before_filter :approver_only
def create def create
cookies.permanent[:moderated] = Time.now.to_i cookies.permanent[:moderated] = Time.now.to_i

2
app/controllers/moderator/post/posts_controller.rb
View File

@@ -1,7 +1,7 @@
module Moderator module Moderator
module Post module Post
class PostsController < ApplicationController class PostsController < ApplicationController
before_filter :post_approvers_only, :only => [:delete, :undelete, :move_favorites, :ban, :unban, :confirm_delete, :confirm_move_favorites, :confirm_ban] before_filter :approver_only, :only => [:delete, :undelete, :move_favorites, :ban, :unban, :confirm_delete, :confirm_move_favorites, :confirm_ban]
before_filter :admin_only, :only => [:expunge] before_filter :admin_only, :only => [:expunge]
rescue_from ::PostFlag::Error, ::Post::ApprovalError, :with => :rescue_exception rescue_from ::PostFlag::Error, ::Post::ApprovalError, :with => :rescue_exception

2
app/controllers/moderator/post/queues_controller.rb
View File

@@ -2,7 +2,7 @@ module Moderator
module Post module Post
class QueuesController < ApplicationController class QueuesController < ApplicationController
respond_to :html, :json respond_to :html, :json
before_filter :post_approvers_only before_filter :approver_only
def show def show
cookies.permanent[:moderated] = Time.now.to_i cookies.permanent[:moderated] = Time.now.to_i

4
app/models/user.rb
View File

@@ -430,6 +430,10 @@ class User < ActiveRecord::Base
is_gold? || is_super_voter? is_gold? || is_super_voter?
end end
def is_approver?
can_approve_posts?
end
def create_mod_action def create_mod_action
if level_changed? if level_changed?
ModAction.create(:description => %{"#{name}":/users/#{id} level changed #{level_string_was} -> #{level_string}}) ModAction.create(:description => %{"#{name}":/users/#{id} level changed #{level_string_was} -> #{level_string}})