Merge branch 'master' into openstreetbugs

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

diff --git a/app/models/note.rb b/app/models/note.rb
index 892ada1aa8a5163d474bbde166ca4b9251f4d1fa..a2937074c4053d8b4eaaca9a051fb4b67508d0e4 100644 (file)
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -72,17 +72,4 @@ class Note < ActiveRecord::Base
   def author_name
     self.comments.first.author_name
   end
-
-  # Custom JSON output routine for notes
-  def to_json(options = {})
-    super options.reverse_merge(
-      :methods => [ :lat, :lon ], 
-      :only => [ :id, :status, :created_at ],
-      :include => {
-         :comments => {
-           :only => [ :event, :author_name, :created_at, :body ]
-         }
-      }
-    )
-  end
 end