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

pundit: convert bulk update requests to pundit.

Browse Source
This commit is contained in:
evazion
2020-03-17 18:32:29 -05:00
parent b83c612246
commit 79a365abe0
6 changed files with 76 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/models/bulk_update_request.rb
View File

@@ -10,9 +10,9 @@ class BulkUpdateRequest < ApplicationRecord
validates_presence_of :script
validates_presence_of :title, if: ->(rec) {rec.forum_topic_id.blank?}
validates_presence_of :forum_topic, if: ->(rec) {rec.forum_topic_id.present?}
validates_inclusion_of :status, :in => %w(pending approved rejected)
validate :script_formatted_correctly
validate :forum_topic_id_not_invalid
validate :validate_script, :on => :create
before_validation :normalize_text
after_create :create_forum_topic
@@ -113,20 +113,6 @@ class BulkUpdateRequest < ApplicationRecord
errors[:base] << e.message
end
def forum_topic_id_not_invalid
if forum_topic_id
if !forum_topic
errors[:base] << "Forum topic ID is invalid"
elsif !forum_topic.visible?(CurrentUser.user)
errors[:base] << "Forum topic is private"
elsif forum_topic.is_locked
errors[:base] << "Forum topic is locked"
elsif forum_topic.is_deleted
errors[:base] << "Forum topic is deleted"
end
end
end
def validate_script
AliasAndImplicationImporter.new(script, forum_topic_id, "1", skip_secondary_validations).validate!
rescue RuntimeError => e
@@ -138,18 +124,6 @@ class BulkUpdateRequest < ApplicationRecord
include ApprovalMethods
include ValidationMethods
def editable?(user)
user_id == user.id || user.is_builder?
end
def approvable?(user)
!is_approved? && user.is_admin?
end
def rejectable?(user)
is_pending? && editable?(user)
end
def reason_with_link
"[bur:#{id}]\n\nReason: #{reason}"
end