Merge remote-tracking branch 'upstream/pull/5493'

[rails.git] / app / models / note.rb

diff --git a/app/models/note.rb b/app/models/note.rb
index 2ec72a03ac6fd5bf228d3319546fd6700e140995..6a83b6b0117dabc49917fa38e045f3893ea96b76 100644 (file)
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -16,10 +16,11 @@
 #
 # Indexes
 #
-#  index_notes_on_description  (to_tsvector('english'::regconfig, description)) USING gin
-#  notes_created_at_idx        (created_at)
-#  notes_tile_status_idx       (tile,status)
-#  notes_updated_at_idx        (updated_at)
+#  index_notes_on_description             (to_tsvector('english'::regconfig, description)) USING gin
+#  index_notes_on_user_id_and_created_at  (user_id,created_at) WHERE (user_id IS NOT NULL)
+#  notes_created_at_idx                   (created_at)
+#  notes_tile_status_idx                  (tile,status)
+#  notes_updated_at_idx                   (updated_at)
 #
 # Foreign Keys
 #
@@ -92,22 +93,9 @@ class Note < ApplicationRecord
     closed_at + DEFAULT_FRESHLY_CLOSED_LIMIT
   end
 
-  # Return the note's description, derived from the first comment
+  # Return the note's description
   def description
-    if user_ip.nil? && user_id.nil?
-      all_comments.first.body if all_comments.first&.event == "opened"
-    else
-      RichText.new("text", super)
-    end
-  end
-
-  # Return the note's author object, derived from the first comment
-  def author
-    if user_ip.nil? && user_id.nil?
-      all_comments.first.author if all_comments.first&.event == "opened"
-    else
-      super
-    end
+    RichText.new("text", super)
   end
 
   private