X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/78f608b114c05f1147936a57b930831e28000c1a..6279d83260cd9a03395a73f1c3df66ffe4c9486d:/app/controllers/notes_controller.rb

diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index 5a0934247..a7fa03ac7 100644
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -58,7 +58,6 @@ class NotesController < ApplicationController
     lon = params[:lon].to_f
     lat = params[:lat].to_f
     comment = params[:text]
-    name = params[:name]
 
     # Include in a transaction to ensure that there is always a note_comment for every note
     Note.transaction do
@@ -70,7 +69,7 @@ class NotesController < ApplicationController
       @note.save!
 
       # Add a comment to the note
-      add_comment(@note, comment, name, "opened")
+      add_comment(@note, comment, "opened")
     end
 
     # Return a copy of the new note
@@ -90,16 +89,15 @@ class NotesController < ApplicationController
     # Extract the arguments
     id = params[:id].to_i
     comment = params[:text]
-    name = params[:name] or "NoName"
 
     # Find the note and check it is valid
     @note = Note.find(id)
     raise OSM::APINotFoundError unless @note
-    raise OSM::APIAlreadyDeletedError unless @note.visible?
+    raise OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible?
 
     # Add a comment to the note
     Note.transaction do
-      add_comment(@note, comment, name, "commented")
+      add_comment(@note, comment, "commented")
     end
 
     # Return a copy of the updated note
@@ -118,18 +116,17 @@ class NotesController < ApplicationController
     # Extract the arguments
     id = params[:id].to_i
     comment = params[:text]
-    name = params[:name]
 
     # Find the note and check it is valid
     @note = Note.find_by_id(id)
     raise OSM::APINotFoundError unless @note
-    raise OSM::APIAlreadyDeletedError unless @note.visible?
+    raise OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible?
 
     # Close the note and add a comment
     Note.transaction do
       @note.close
 
-      add_comment(@note, comment, name, "closed")
+      add_comment(@note, comment, "closed")
     end
 
     # Return a copy of the updated note
@@ -173,8 +170,8 @@ class NotesController < ApplicationController
     # Find the note and check it is valid
     @note = Note.find(params[:id])
     raise OSM::APINotFoundError unless @note
-    raise OSM::APIAlreadyDeletedError unless @note.visible?
-    
+    raise OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible?
+
     # Render the result
     respond_to do |format|
       format.xml
@@ -192,19 +189,18 @@ class NotesController < ApplicationController
 
     # Extract the arguments
     id = params[:id].to_i
-    name = params[:name]
 
     # Find the note and check it is valid
     note = Note.find(id)
     raise OSM::APINotFoundError unless note
-    raise OSM::APIAlreadyDeletedError unless note.visible?
+    raise OSM::APIAlreadyDeletedError.new("note", note.id) unless note.visible?
 
     # Mark the note as hidden
     Note.transaction do
       note.status = "hidden"
       note.save
 
-      add_comment(note, nil, name, "hidden")
+      add_comment(note, nil, "hidden")
     end
 
     # Render the result
@@ -240,10 +236,10 @@ class NotesController < ApplicationController
       if @this_user = User.active.find_by_display_name(params[:display_name])
         @title =  t 'note.mine.title', :user => @this_user.display_name 
         @heading =  t 'note.mine.heading', :user => @this_user.display_name 
-        @description = t 'note.mine.description', :user => render_to_string(:partial => "user", :object => @this_user)
+        @description = t 'note.mine.subheading', :user => render_to_string(:partial => "user", :object => @this_user)
         @page = (params[:page] || 1).to_i 
         @page_size = 10
-        @notes = @this_user.notes.order("updated_at DESC").offset((@page - 1) * @page_size).limit(@page_size).preload(:comments => :author)
+        @notes = @this_user.notes.order("updated_at DESC, id").uniq.offset((@page - 1) * @page_size).limit(@page_size).preload(:comments => :author)
       else
         @title = t 'user.no_such_user.title' 
         @not_found_user = params[:display_name] 
@@ -302,17 +298,13 @@ private
 
   ##
   # Add a comment to a note
-  def add_comment(note, text, name, event)
-    name = "NoName" if name.nil?
-
+  def add_comment(note, text, event)
     attributes = { :visible => true, :event => event, :body => text }
 
     if @user  
       attributes[:author_id] = @user.id
-      attributes[:author_name] = @user.display_name
     else  
       attributes[:author_ip] = request.remote_ip
-      attributes[:author_name] = name + " (a)"
     end
 
     comment = note.comments.create(attributes, :without_protection => true)