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

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

diff --git a/app/models/note.rb b/app/models/note.rb
index 0a1f4abd7fed5594c0560180d5c77163a4066a02..068efa59a3c35c39c920e1d92882822963bde444 100644 (file)
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -2,16 +2,16 @@
 #
 # Table name: notes
 #
 #
 # Table name: notes
 #

-#  id          :bigint(8)        not null, primary key
+#  id          :bigint           not null, primary key

 #  latitude    :integer          not null
 #  longitude   :integer          not null
 #  latitude    :integer          not null
 #  longitude   :integer          not null

-#  tile        :bigint(8)        not null
+#  tile        :bigint           not null

 #  updated_at  :datetime         not null
 #  created_at  :datetime         not null
 #  status      :enum             not null
 #  closed_at   :datetime
 #  description :text             default(""), not null
 #  updated_at  :datetime         not null
 #  created_at  :datetime         not null
 #  status      :enum             not null
 #  closed_at   :datetime
 #  description :text             default(""), not null

-#  user_id     :bigint(8)
+#  user_id     :bigint

 #  user_ip     :inet
 #
 # Indexes
 #  user_ip     :inet
 #
 # Indexes


@@ -92,22 +92,9 @@ class Note < ApplicationRecord
     closed_at + DEFAULT_FRESHLY_CLOSED_LIMIT
   end
 
     closed_at + DEFAULT_FRESHLY_CLOSED_LIMIT
   end
 

-  # Return the note's description, derived from the first comment
+  # Return the note's description

   def 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
   end
 
   private