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

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

diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index ea32441f2f5db86aa4ff7780cf0b629dcd9f4538..b1dd6d162495167cf92a62c07174166342e31a55 100644 (file)
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -1,6 +1,7 @@
 class NotesController < ApplicationController
   layout "site", :only => [:mine]
 
 class NotesController < ApplicationController
   layout "site", :only => [:mine]
 

+  skip_before_action :verify_authenticity_token, :except => [:mine]

   before_action :check_api_readable
   before_action :authorize_web, :only => [:mine]
   before_action :setup_user_auth, :only => [:create, :comment]
   before_action :check_api_readable
   before_action :authorize_web, :only => [:mine]
   before_action :setup_user_auth, :only => [:create, :comment]


@@ -19,10 +20,10 @@ class NotesController < ApplicationController
     if params[:bbox]
       bbox = BoundingBox.from_bbox_params(params)
     else
     if params[:bbox]
       bbox = BoundingBox.from_bbox_params(params)
     else

-      fail OSM::APIBadUserInput.new("No l was given") unless params[:l]
-      fail OSM::APIBadUserInput.new("No r was given") unless params[:r]
-      fail OSM::APIBadUserInput.new("No b was given") unless params[:b]
-      fail OSM::APIBadUserInput.new("No t was given") unless params[:t]
+      raise OSM::APIBadUserInput, "No l was given" unless params[:l]
+      raise OSM::APIBadUserInput, "No r was given" unless params[:r]
+      raise OSM::APIBadUserInput, "No b was given" unless params[:b]
+      raise OSM::APIBadUserInput, "No t was given" unless params[:t]

 
       bbox = BoundingBox.from_lrbt_params(params)
     end
 
       bbox = BoundingBox.from_lrbt_params(params)
     end


@@ -52,12 +53,12 @@ class NotesController < ApplicationController
   # Create a new note
   def create
     # Check the ACLs
   # Create a new note
   def create
     # Check the ACLs

-    fail OSM::APIAccessDenied if Acl.no_note_comment(request.remote_ip)
+    raise OSM::APIAccessDenied if Acl.no_note_comment(request.remote_ip)

 
     # Check the arguments are sane
 
     # Check the arguments are sane

-    fail OSM::APIBadUserInput.new("No lat was given") unless params[:lat]
-    fail OSM::APIBadUserInput.new("No lon was given") unless params[:lon]
-    fail OSM::APIBadUserInput.new("No text was given") if params[:text].blank?
+    raise OSM::APIBadUserInput, "No lat was given" unless params[:lat]
+    raise OSM::APIBadUserInput, "No lon was given" unless params[:lon]
+    raise OSM::APIBadUserInput, "No text was given" if params[:text].blank?

 
     # Extract the arguments
     lon = OSM.parse_float(params[:lon], OSM::APIBadUserInput, "lon was not a number")
 
     # Extract the arguments
     lon = OSM.parse_float(params[:lon], OSM::APIBadUserInput, "lon was not a number")


@@ -68,7 +69,7 @@ class NotesController < ApplicationController
     Note.transaction do
       # Create the note
       @note = Note.create(:lat => lat, :lon => lon)
     Note.transaction do
       # Create the note
       @note = Note.create(:lat => lat, :lon => lon)

-      fail OSM::APIBadUserInput.new("The note is outside this world") unless @note.in_world?
+      raise OSM::APIBadUserInput, "The note is outside this world" unless @note.in_world?

 
       # Save the note
       @note.save!
 
       # Save the note
       @note.save!


@@ -88,11 +89,11 @@ class NotesController < ApplicationController
   # Add a comment to an existing note
   def comment
     # Check the ACLs
   # Add a comment to an existing note
   def comment
     # Check the ACLs

-    fail OSM::APIAccessDenied if Acl.no_note_comment(request.remote_ip)
+    raise OSM::APIAccessDenied if Acl.no_note_comment(request.remote_ip)

 
     # Check the arguments are sane
 
     # Check the arguments are sane

-    fail OSM::APIBadUserInput.new("No id was given") unless params[:id]
-    fail OSM::APIBadUserInput.new("No text was given") if params[:text].blank?
+    raise OSM::APIBadUserInput, "No id was given" unless params[:id]
+    raise OSM::APIBadUserInput, "No text was given" if params[:text].blank?

 
     # Extract the arguments
     id = params[:id].to_i
 
     # Extract the arguments
     id = params[:id].to_i


@@ -100,9 +101,9 @@ class NotesController < ApplicationController
 
     # Find the note and check it is valid
     @note = Note.find(id)
 
     # Find the note and check it is valid
     @note = Note.find(id)

-    fail OSM::APINotFoundError unless @note
-    fail OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible?
-    fail OSM::APINoteAlreadyClosedError.new(@note) if @note.closed?
+    raise OSM::APINotFoundError unless @note
+    raise OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible?
+    raise OSM::APINoteAlreadyClosedError, @note if @note.closed?

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


@@ -120,17 +121,17 @@ class NotesController < ApplicationController
   # Close a note
   def close
     # Check the arguments are sane
   # Close a note
   def close
     # Check the arguments are sane

-    fail OSM::APIBadUserInput.new("No id was given") unless params[:id]
+    raise OSM::APIBadUserInput, "No id was given" unless params[:id]

 
     # Extract the arguments
     id = params[:id].to_i
     comment = params[:text]
 
     # Find the note and check it is valid
 
     # Extract the arguments
     id = params[:id].to_i
     comment = params[:text]
 
     # Find the note and check it is valid

-    @note = Note.find_by_id(id)
-    fail OSM::APINotFoundError unless @note
-    fail OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible?
-    fail OSM::APINoteAlreadyClosedError.new(@note) if @note.closed?
+    @note = Note.find_by(:id => id)
+    raise OSM::APINotFoundError unless @note
+    raise OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible?
+    raise OSM::APINoteAlreadyClosedError, @note if @note.closed?

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


@@ -150,17 +151,17 @@ class NotesController < ApplicationController
   # Reopen a note
   def reopen
     # Check the arguments are sane
   # Reopen a note
   def reopen
     # Check the arguments are sane

-    fail OSM::APIBadUserInput.new("No id was given") unless params[:id]
+    raise OSM::APIBadUserInput, "No id was given" unless params[:id]

 
     # Extract the arguments
     id = params[:id].to_i
     comment = params[:text]
 
     # Find the note and check it is valid
 
     # Extract the arguments
     id = params[:id].to_i
     comment = params[:text]
 
     # Find the note and check it is valid

-    @note = Note.find_by_id(id)
-    fail OSM::APINotFoundError unless @note
-    fail OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible? || @user.moderator?
-    fail OSM::APINoteAlreadyOpenError.new(@note) unless @note.closed? || !@note.visible?
+    @note = Note.find_by(:id => id)
+    raise OSM::APINotFoundError unless @note
+    raise OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible? || current_user.moderator?
+    raise OSM::APINoteAlreadyOpenError, @note unless @note.closed? || !@note.visible?

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


@@ -205,12 +206,12 @@ class NotesController < ApplicationController
   # Read a note
   def show
     # Check the arguments are sane
   # Read a note
   def show
     # Check the arguments are sane

-    fail OSM::APIBadUserInput.new("No id was given") unless params[:id]
+    raise OSM::APIBadUserInput, "No id was given" unless params[:id]

 
     # Find the note and check it is valid
     @note = Note.find(params[:id])
 
     # Find the note and check it is valid
     @note = Note.find(params[:id])

-    fail OSM::APINotFoundError unless @note
-    fail OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible?
+    raise OSM::APINotFoundError unless @note
+    raise OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible?

 
     # Render the result
     respond_to do |format|
 
     # Render the result
     respond_to do |format|


@@ -225,7 +226,7 @@ class NotesController < ApplicationController
   # Delete (hide) a note
   def destroy
     # Check the arguments are sane
   # Delete (hide) a note
   def destroy
     # Check the arguments are sane

-    fail OSM::APIBadUserInput.new("No id was given") unless params[:id]
+    raise OSM::APIBadUserInput, "No id was given" unless params[:id]

 
     # Extract the arguments
     id = params[:id].to_i
 
     # Extract the arguments
     id = params[:id].to_i


@@ -233,8 +234,8 @@ class NotesController < ApplicationController
 
     # Find the note and check it is valid
     @note = Note.find(id)
 
     # Find the note and check it is valid
     @note = Note.find(id)

-    fail OSM::APINotFoundError unless @note
-    fail OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible?
+    raise OSM::APINotFoundError unless @note
+    raise OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible?

 
     # Mark the note as hidden
     Note.transaction do
 
     # Mark the note as hidden
     Note.transaction do


@@ -255,7 +256,7 @@ class NotesController < ApplicationController
   # Return a list of notes matching a given string
   def search
     # Check the arguments are sane
   # Return a list of notes matching a given string
   def search
     # Check the arguments are sane

-    fail OSM::APIBadUserInput.new("No query string was given") unless params[:q]
+    raise OSM::APIBadUserInput, "No query string was given" unless params[:q]

 
     # Get any conditions that need to be applied
     @notes = closed_condition(Note.all)
 
     # Get any conditions that need to be applied
     @notes = closed_condition(Note.all)


@@ -277,13 +278,16 @@ class NotesController < ApplicationController
   # Display a list of notes by a specified user
   def mine
     if params[:display_name]
   # Display a list of notes by a specified user
   def mine
     if params[:display_name]

-      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.subheading", :user => render_to_string(:partial => "user", :object => @this_user)
+      if @user = User.active.find_by(:display_name => params[:display_name])
+        @params = params.permit(:display_name)
+        @title = t "note.mine.title", :user => @user.display_name
+        @heading = t "note.mine.heading", :user => @user.display_name
+        @description = t "note.mine.subheading", :user => render_to_string(:partial => "user", :object => @user)

         @page = (params[:page] || 1).to_i
         @page_size = 10
         @page = (params[:page] || 1).to_i
         @page_size = 10

-        @notes = @this_user.notes.order("updated_at DESC, id").uniq.offset((@page - 1) * @page_size).limit(@page_size).preload(:comments => :author).to_a
+        @notes = @user.notes
+        @notes = @notes.visible unless current_user && current_user.moderator?
+        @notes = @notes.order("updated_at DESC, id").distinct.offset((@page - 1) * @page_size).limit(@page_size).preload(:comments => :author).to_a

       else
         @title = t "user.no_such_user.title"
         @not_found_user = params[:display_name]
       else
         @title = t "user.no_such_user.title"
         @not_found_user = params[:display_name]


@@ -306,7 +310,7 @@ class NotesController < ApplicationController
       if params[:limit].to_i > 0 && params[:limit].to_i <= 10000
         params[:limit].to_i
       else
       if params[:limit].to_i > 0 && params[:limit].to_i <= 10000
         params[:limit].to_i
       else

-        fail OSM::APIBadUserInput.new("Note limit must be between 1 and 10000")
+        raise OSM::APIBadUserInput, "Note limit must be between 1 and 10000"

       end
     else
       100
       end
     else
       100


@@ -314,24 +318,22 @@ class NotesController < ApplicationController
   end
 
   ##
   end
 
   ##

-  # Generate a condition to choose which bugs we want based
+  # Generate a condition to choose which notes we want based

   # on their status and the user's request parameters
   def closed_condition(notes)
   # on their status and the user's request parameters
   def closed_condition(notes)

-    if params[:closed]
-      closed_since = params[:closed].to_i
-    else
-      closed_since = 7
-    end
+    closed_since = if params[:closed]
+                     params[:closed].to_i
+                   else
+                     7
+                   end

 
     if closed_since < 0
 
     if closed_since < 0

-      notes = notes.where("status != 'hidden'")
+      notes.where("status != 'hidden'")

     elsif closed_since > 0
     elsif closed_since > 0

-      notes = notes.where("(status = 'open' OR (status = 'closed' AND closed_at > '#{Time.now - closed_since.days}'))")
+      notes.where("(status = 'open' OR (status = 'closed' AND closed_at > '#{Time.now - closed_since.days}'))")

     else
     else

-      notes = notes.where("status = 'open'")
+      notes.where("status = 'open'")

     end
     end

-
-    notes

   end
 
   ##
   end
 
   ##


@@ -339,18 +341,16 @@ class NotesController < ApplicationController
   def add_comment(note, text, event, notify = true)
     attributes = { :visible => true, :event => event, :body => text }
 
   def add_comment(note, text, event, notify = true)
     attributes = { :visible => true, :event => event, :body => text }
 

-    if @user
-      attributes[:author_id] = @user.id
+    if current_user
+      attributes[:author_id] = current_user.id

     else
       attributes[:author_ip] = request.remote_ip
     end
 
     else
       attributes[:author_ip] = request.remote_ip
     end
 

-    comment = note.comments.create(attributes)
+    comment = note.comments.create!(attributes)

 
     note.comments.map(&:author).uniq.each do |user|
 
     note.comments.map(&:author).uniq.each do |user|

-      if notify && user && user != @user
-        Notifier.note_comment_notification(comment, user).deliver_now
-      end
+      Notifier.note_comment_notification(comment, user).deliver_now if notify && user && user != current_user && user.visible?

     end
   end
 end
     end
   end
 end