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

dynamic requests: handle deleted/processing/queued statuses (#3824)

Browse Source 
Fix bug where [ta:1234] didn't render if the request's status was
'deleted', 'queued', or 'processing'.
This commit is contained in:
evazion
2019-01-24 13:52:16 -06:00
parent 4fe7f5eff9
commit 1292717c52
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/helpers/forum_topics_helper.rb
View File

@@ -9,14 +9,18 @@ module ForumTopicsHelper
def tag_request_message(obj)
if obj.is_a?(TagRelationship)
if obj.is_active?
return "The #{obj.relationship} ##{obj.id} [[#{obj.antecedent_name}]] -> [[#{obj.consequent_name}]] is active."
if obj.is_approved?
return "The #{obj.relationship} ##{obj.id} [[#{obj.antecedent_name}]] -> [[#{obj.consequent_name}]] has been approved."
elsif obj.is_retired?
return "The #{obj.relationship} ##{obj.id} [[#{obj.antecedent_name}]] -> [[#{obj.consequent_name}]] has been retired"
return "The #{obj.relationship} ##{obj.id} [[#{obj.antecedent_name}]] -> [[#{obj.consequent_name}]] has been retired."
elsif obj.is_deleted?
return "The #{obj.relationship} ##{obj.id} [[#{obj.antecedent_name}]] -> [[#{obj.consequent_name}]] has been rejected."
elsif obj.is_pending?
return "The #{obj.relationship} ##{obj.id} [[#{obj.antecedent_name}]] -> [[#{obj.consequent_name}]] is pending approval."
elsif obj.is_errored?
return "The #{obj.relationship} ##{obj.id} [[#{obj.antecedent_name}]] -> [[#{obj.consequent_name}]] (#{relationship} failed during processing."
else # should never happen
return "The #{obj.relationship} ##{obj.id} [[#{obj.antecedent_name}]] -> [[#{obj.consequent_name}]] has an unknown status."
end
end
@@ -38,12 +42,7 @@ module ForumTopicsHelper
end
def parse_embedded_tag_request_text(text)
# for dev mode, prime these
if Rails.env.development?
[TagAlias, TagImplication]
end
[*TagRelationship.subclasses, BulkUpdateRequest].each do |tag_request|
[TagAlias, TagImplication, BulkUpdateRequest].each do |tag_request|
text.gsub!(tag_request.embedded_pattern) do |match|
begin
obj = tag_request.find($~[:id])