Remove the author_name field from notes

[rails.git] / app / controllers / notes_controller.rb

diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index fe3615d7a0965e4290a21b5eb47fc00c9203ac63..d25d9a37e9a756d39dd5a438cb3dbc2858fb7605 100644 (file)
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -3,8 +3,8 @@ class NotesController < ApplicationController
   layout 'site', :only => [:mine]
 
   before_filter :check_api_readable
   layout 'site', :only => [:mine]
 
   before_filter :check_api_readable

-  before_filter :authorize_web, :only => [:create, :close, :update, :delete, :mine]
-  before_filter :check_api_writable, :only => [:create, :close, :update, :delete]
+  before_filter :authorize_web, :only => [:create, :comment, :close, :destroy, :mine]
+  before_filter :check_api_writable, :only => [:create, :comment, :close, :destroy]

   before_filter :set_locale, :only => [:mine]
   after_filter :compress_output
   around_filter :api_call_handle_error, :api_call_timeout
   before_filter :set_locale, :only => [:mine]
   after_filter :compress_output
   around_filter :api_call_handle_error, :api_call_timeout


@@ -58,7 +58,6 @@ class NotesController < ApplicationController
     lon = params[:lon].to_f
     lat = params[:lat].to_f
     comment = params[:text]
     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
 
     # Include in a transaction to ensure that there is always a note_comment for every note
     Note.transaction do


@@ -66,29 +65,18 @@ class NotesController < ApplicationController
       @note = Note.create(:lat => lat, :lon => lon)
       raise OSM::APIBadUserInput.new("The note is outside this world") unless @note.in_world?
 
       @note = Note.create(:lat => lat, :lon => lon)
       raise OSM::APIBadUserInput.new("The note is outside this world") unless @note.in_world?
 

-      #TODO: move this into a helper function
-      begin
-        url = "http://nominatim.openstreetmap.org/reverse?lat=" + lat.to_s + "&lon=" + lon.to_s + "&zoom=16" 
-        response = REXML::Document.new(Net::HTTP.get(URI.parse(url))) 
-               
-        if result = response.get_text("reversegeocode/result") 
-          @note.nearby_place = result.to_s 
-        else 
-          @note.nearby_place = "unknown"
-        end
-      rescue Exception => err
-        @note.nearby_place = "unknown"
-      end
-

       # Save the note
       @note.save!
 
       # Add a comment to the note
       # Save the note
       @note.save!
 
       # Add a comment to the note

-      add_comment(@note, comment, name, "opened")
+      add_comment(@note, comment, "opened")

     end
 
     end
 

-    # Send an OK response
-    render_ok
+    # Return a copy of the new note
+    respond_to do |format|
+      format.xml { render :action => :show }
+      format.json { render :action => :show }
+    end

   end
 
   ##
   end
 
   ##


@@ -101,20 +89,22 @@ class NotesController < ApplicationController
     # Extract the arguments
     id = params[:id].to_i
     comment = params[:text]
     # Extract the arguments
     id = params[:id].to_i
     comment = params[:text]

-    name = params[:name] or "NoName"

 
     # Find the note and check it is valid
 
     # Find the note and check it is valid

-    note = Note.find(id)
-    raise OSM::APINotFoundError unless note
-    raise OSM::APIAlreadyDeletedError unless note.visible?
+    @note = Note.find(id)
+    raise OSM::APINotFoundError unless @note
+    raise OSM::APIAlreadyDeletedError unless @note.visible?

 
     # Add a comment to the note
     Note.transaction do
 
     # Add a comment to the note
     Note.transaction do

-      add_comment(note, comment, name, "commented")
+      add_comment(@note, comment, "commented")

     end
 
     end
 

-    # Send an OK response
-    render_ok
+    # Return a copy of the updated note
+    respond_to do |format|
+      format.xml { render :action => :show }
+      format.json { render :action => :show }
+    end

   end
 
   ##
   end
 
   ##


@@ -125,22 +115,25 @@ class NotesController < ApplicationController
 
     # Extract the arguments
     id = params[:id].to_i
 
     # Extract the arguments
     id = params[:id].to_i

-    name = params[:name]
+    comment = params[:text]

 
     # Find the note and check it is valid
 
     # 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?
+    @note = Note.find_by_id(id)
+    raise OSM::APINotFoundError unless @note
+    raise OSM::APIAlreadyDeletedError unless @note.visible?

 
     # Close the note and add a comment
     Note.transaction do
 
     # Close the note and add a comment
     Note.transaction do

-      note.close
+      @note.close

 
 

-      add_comment(note, nil, name, "closed")
+      add_comment(@note, comment, "closed")

     end
 
     end
 

-    # Send an OK response
-    render_ok
+    # Return a copy of the updated note
+    respond_to do |format|
+      format.xml { render :action => :show }
+      format.json { render :action => :show }
+    end

   end 
 
   ##
   end 
 
   ##


@@ -196,7 +189,6 @@ class NotesController < ApplicationController
 
     # Extract the arguments
     id = params[:id].to_i
 
     # Extract the arguments
     id = params[:id].to_i

-    name = params[:name]

 
     # Find the note and check it is valid
     note = Note.find(id)
 
     # Find the note and check it is valid
     note = Note.find(id)


@@ -208,7 +200,7 @@ class NotesController < ApplicationController
       note.status = "hidden"
       note.save
 
       note.status = "hidden"
       note.save
 

-      add_comment(note, nil, name, "hidden")
+      add_comment(note, nil, "hidden")

     end
 
     # Render the result
     end
 
     # Render the result


@@ -306,24 +298,20 @@ private
 
   ##
   # Add a comment to a note
 
   ##
   # 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 = { :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
     else  
       attributes[:author_ip] = request.remote_ip

-      attributes[:author_name] = name + " (a)"

     end
 
     end
 

-    note.comments.create(attributes, :without_protection => true)
+    comment = note.comments.create(attributes, :without_protection => true)

 
     note.comments.map { |c| c.author }.uniq.each do |user|
       if user and user != @user
 
     note.comments.map { |c| c.author }.uniq.each do |user|
       if user and user != @user

-        Notifier.deliver_note_comment_notification(comment, user)
+        Notifier.note_comment_notification(comment, user).deliver

       end
     end
   end
       end
     end
   end