From 144febc104b56845e0bd28bd8c48e9f2fd920325 Mon Sep 17 00:00:00 2001 From: r888888888 Date: Fri, 14 Apr 2017 12:49:41 -0700 Subject: [PATCH] remove timestamps --- app/models/bulk_update_request.rb | 6 +++--- app/models/tag_alias.rb | 8 ++++---- app/models/tag_implication.rb | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/models/bulk_update_request.rb b/app/models/bulk_update_request.rb index 2bc849ed5..ddd615752 100644 --- a/app/models/bulk_update_request.rb +++ b/app/models/bulk_update_request.rb @@ -52,13 +52,13 @@ class BulkUpdateRequest < ActiveRecord::Base CurrentUser.scoped(approver) do AliasAndImplicationImporter.new(script, forum_topic_id, "1", true).process! update({ :status => "approved", :approver_id => CurrentUser.id, :skip_secondary_validations => true }, :as => CurrentUser.role) - forum_updater.update("[i]UPDATE #{date_timestamp}[/i]: The \"bulk update request ##{id}\":/bulk_update_requests?search%5Bid%5D=#{id} has been approved.", "APPROVED") + forum_updater.update("The \"bulk update request ##{id}\":/bulk_update_requests?search%5Bid%5D=#{id} has been approved.", "APPROVED") end rescue Exception => x self.approver = approver CurrentUser.scoped(approver) do - forum_updater.update("[i]UPDATE #{date_timestamp}[/i]: \"Bulk update request ##{id}\":/bulk_update_requests?search%5Bid%5D=#{id} failed: #{x.to_s}", "FAILED") + forum_updater.update("The \"Bulk update request ##{id}\":/bulk_update_requests?search%5Bid%5D=#{id} has failed: #{x.to_s}", "FAILED") end end @@ -77,7 +77,7 @@ class BulkUpdateRequest < ActiveRecord::Base end def reject! - forum_updater.update("[i]UPDATE #{date_timestamp}[/i]: The \"bulk update request ##{id}\":/bulk_update_requests?search%5Bid%5D=#{id} has been rejected.", "REJECTED") + forum_updater.update("The \"bulk update request ##{id}\":/bulk_update_requests?search%5Bid%5D=#{id} has been rejected.", "REJECTED") update_attribute(:status, "rejected") end end diff --git a/app/models/tag_alias.rb b/app/models/tag_alias.rb index e8f377735..53d915173 100644 --- a/app/models/tag_alias.rb +++ b/app/models/tag_alias.rb @@ -87,19 +87,19 @@ class TagAlias < ActiveRecord::Base end def approval_message - "[i]UPDATE #{date_timestamp}[/i]: The tag alias [[#{antecedent_name}]] -> [[#{consequent_name}]] (alias ##{id}) has been approved." + "The tag alias [[#{antecedent_name}]] -> [[#{consequent_name}]] (alias ##{id}) has been approved." end def failure_message(e = nil) - "[i]UPDATE #{date_timestamp}[/i]: The tag alias [[#{antecedent_name}]] -> [[#{consequent_name}]] (alias ##{id}) failed during processing. Reason: #{e}" + "The tag alias [[#{antecedent_name}]] -> [[#{consequent_name}]] (alias ##{id}) failed during processing. Reason: #{e}" end def reject_message - "[i]UPDATE #{date_timestamp}[/i]: The tag alias [[#{antecedent_name}]] -> [[#{consequent_name}]] (alias ##{id}) has been rejected." + "The tag alias [[#{antecedent_name}]] -> [[#{consequent_name}]] (alias ##{id}) has been rejected." end def conflict_message - "[i]UPDATE #{date_timestamp}[/i]: The tag alias [[#{antecedent_name}]] -> [[#{consequent_name}]] (alias ##{id}) has conflicting wiki pages. [[#{consequent_name}]] should be updated to include information from [[#{antecedent_name}]] if necessary." + "The tag alias [[#{antecedent_name}]] -> [[#{consequent_name}]] (alias ##{id}) has conflicting wiki pages. [[#{consequent_name}]] should be updated to include information from [[#{antecedent_name}]] if necessary." end def date_timestamp diff --git a/app/models/tag_implication.rb b/app/models/tag_implication.rb index 38338bb91..4436d1ffb 100644 --- a/app/models/tag_implication.rb +++ b/app/models/tag_implication.rb @@ -190,7 +190,7 @@ class TagImplication < ActiveRecord::Base update_posts update({ :status => "active" }, :as => CurrentUser.role) update_descendant_names_for_parents - forum_updater.update("[i]UPDATE #{date_timestamp}[/i]: The tag implication #{antecedent_name} -> #{consequent_name} has been approved.", "APPROVED") if update_topic + forum_updater.update("The tag implication #{antecedent_name} -> #{consequent_name} has been approved.", "APPROVED") if update_topic end rescue Exception => e if tries < 5 @@ -199,7 +199,7 @@ class TagImplication < ActiveRecord::Base retry end - forum_updater.update("[i]UPDATE #{date_timestamp}[/i]: The tag implication #{antecedent_name} -> #{consequent_name} failed during processing. Reason: #{e}", "FAILED") if update_topic + forum_updater.update("The tag implication #{antecedent_name} -> #{consequent_name} failed during processing. Reason: #{e}", "FAILED") if update_topic update({ :status => "error: #{e}" }, :as => CurrentUser.role) if Rails.env.production? @@ -228,7 +228,7 @@ class TagImplication < ActiveRecord::Base def reject! update({ :status => "deleted", }, :as => CurrentUser.role) - forum_updater.update("[i]UPDATE #{date_timestamp}[/i]: The tag implication #{antecedent_name} -> #{consequent_name} has been rejected.", "REJECTED") + forum_updater.update("The tag implication #{antecedent_name} -> #{consequent_name} has been rejected.", "REJECTED") destroy end