Merge remote-tracking branch 'openstreetmap/pull/1240'

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

diff --git a/app/controllers/notes_controller.rb b/app/controllers/notes_controller.rb
index 1f9d10b0967204d75435870e6b7ed55916d57e1d..51ef4491d35363be75437919e9089537f1eeff9a 100644 (file)
--- a/app/controllers/notes_controller.rb
+++ b/app/controllers/notes_controller.rb
@@ -1,17 +1,15 @@
 class NotesController < ApplicationController
 class NotesController < ApplicationController

-
-  layout 'site', :only => [:mine]
-
-  before_filter :check_api_readable
-  before_filter :authorize_web, :only => [:mine]
-  before_filter :setup_user_auth, :only => [:create, :comment]
-  before_filter :authorize, :only => [:close, :reopen, :destroy]
-  before_filter :require_moderator, :only => [:destroy]
-  before_filter :check_api_writable, :only => [:create, :comment, :close, :reopen, :destroy]
-  before_filter :require_allow_write_notes, :only => [:create, :comment, :close, :reopen, :destroy]
-  before_filter :set_locale
-  after_filter :compress_output
-  around_filter :api_call_handle_error, :api_call_timeout
+  layout "site", :only => [:mine]
+
+  before_action :check_api_readable
+  before_action :authorize_web, :only => [:mine]
+  before_action :setup_user_auth, :only => [:create, :comment]
+  before_action :authorize, :only => [:close, :reopen, :destroy]
+  before_action :require_moderator, :only => [:destroy]
+  before_action :check_api_writable, :only => [:create, :comment, :close, :reopen, :destroy]
+  before_action :require_allow_write_notes, :only => [:create, :comment, :close, :reopen, :destroy]
+  before_action :set_locale
+  around_action :api_call_handle_error, :api_call_timeout

 
   ##
   # Return a list of notes in a given area
 
   ##
   # Return a list of notes in a given area


@@ -53,6 +51,9 @@ class NotesController < ApplicationController
   ##
   # Create a new note
   def create
   ##
   # Create a new note
   def create

+    # Check the ACLs
+    raise OSM::APIAccessDenied if Acl.no_note_comment(request.remote_ip)
+

     # Check the arguments are sane
     raise OSM::APIBadUserInput.new("No lat was given") unless params[:lat]
     raise OSM::APIBadUserInput.new("No lon was given") unless params[:lon]
     # Check the arguments are sane
     raise OSM::APIBadUserInput.new("No lat was given") unless params[:lat]
     raise OSM::APIBadUserInput.new("No lon was given") unless params[:lon]


@@ -86,6 +87,9 @@ class NotesController < ApplicationController
   ##
   # Add a comment to an existing note
   def comment
   ##
   # Add a comment to an existing note
   def comment

+    # Check the ACLs
+    raise OSM::APIAccessDenied if Acl.no_note_comment(request.remote_ip)
+

     # Check the arguments are sane
     raise OSM::APIBadUserInput.new("No id was given") unless params[:id]
     raise OSM::APIBadUserInput.new("No text was given") if params[:text].blank?
     # Check the arguments are sane
     raise OSM::APIBadUserInput.new("No id was given") unless params[:id]
     raise OSM::APIBadUserInput.new("No text was given") if params[:text].blank?


@@ -140,7 +144,7 @@ class NotesController < ApplicationController
       format.xml { render :action => :show }
       format.json { render :action => :show }
     end
       format.xml { render :action => :show }
       format.json { render :action => :show }
     end

-  end 
+  end

 
   ##
   # Reopen a note
 
   ##
   # Reopen a note


@@ -155,8 +159,8 @@ class NotesController < ApplicationController
     # Find the note and check it is valid
     @note = Note.find_by_id(id)
     raise OSM::APINotFoundError unless @note
     # Find the note and check it is valid
     @note = Note.find_by_id(id)
     raise OSM::APINotFoundError unless @note

-    raise OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible? or @user.moderator?
-    raise OSM::APINoteAlreadyOpenError.new(@note) unless @note.closed? or not @note.visible?
+    raise OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible? || @user.moderator?
+    raise OSM::APINoteAlreadyOpenError.new(@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


@@ -170,7 +174,7 @@ class NotesController < ApplicationController
       format.xml { render :action => :show }
       format.json { render :action => :show }
     end
       format.xml { render :action => :show }
       format.json { render :action => :show }
     end

-  end 
+  end

 
   ##
   # Get a feed of recent notes and comments
 
   ##
   # Get a feed of recent notes and comments


@@ -272,47 +276,39 @@ class NotesController < ApplicationController
   ##
   # Display a list of notes by a specified user
   def mine
   ##
   # Display a list of notes by a specified user
   def mine

-    if params[:display_name] 
+    if params[:display_name]

       if @this_user = User.active.find_by_display_name(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)
-        @page = (params[:page] || 1).to_i 
+        @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)
+        @page = (params[:page] || 1).to_i

         @page_size = 10
         @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 = @this_user.notes
+        @notes = @notes.visible unless @user && @user.moderator?
+        @notes = @notes.order("updated_at DESC, id").uniq.offset((@page - 1) * @page_size).limit(@page_size).preload(:comments => :author).to_a

       else
       else

-        @title = t 'user.no_such_user.title' 
-        @not_found_user = params[:display_name] 
+        @title = t "user.no_such_user.title"
+        @not_found_user = params[:display_name]

 
 

-        render :template => 'user/no_such_user', :status => :not_found 
-      end 
+        render :template => "user/no_such_user", :status => :not_found
+      end

     end
   end
 
     end
   end
 

-private 
-  #------------------------------------------------------------ 
-  # utility functions below. 
-  #------------------------------------------------------------   
- 
-  ##
-  # Render an OK response
-  def render_ok
-    if params[:format] == "js"
-      render :text => "osbResponse();", :content_type => "text/javascript" 
-    else
-      render :text => "ok " + @note.id.to_s + "\n", :content_type => "text/plain" if @note
-      render :text => "ok\n", :content_type => "text/plain" unless @note
-    end
-  end
+  private
+
+  #------------------------------------------------------------
+  # utility functions below.
+  #------------------------------------------------------------

 
   ##
   # Get the maximum number of results to return
   def result_limit
     if params[:limit]
 
   ##
   # Get the maximum number of results to return
   def result_limit
     if params[:limit]

-      if params[:limit].to_i > 0 and params[:limit].to_i < 10000
+      if params[:limit].to_i > 0 && params[:limit].to_i <= 10000

         params[:limit].to_i
       else
         params[:limit].to_i
       else

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

       end
     else
       100
       end
     else
       100


@@ -323,21 +319,19 @@ private
   # Generate a condition to choose which bugs we want based
   # on their status and the user's request parameters
   def closed_condition(notes)
   # Generate a condition to choose which bugs we want based
   # 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

-
-    return notes

   end
 
   ##
   end
 
   ##


@@ -345,17 +339,17 @@ private
   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  
+    if @user

       attributes[:author_id] = @user.id
       attributes[:author_id] = @user.id

-    else  
+    else

       attributes[:author_ip] = request.remote_ip
     end
 
     comment = note.comments.create(attributes)
 
       attributes[:author_ip] = request.remote_ip
     end
 
     comment = note.comments.create(attributes)
 

-    note.comments.map { |c| c.author }.uniq.each do |user|
-      if notify and user and user != @user
-        Notifier.note_comment_notification(comment, user).deliver
+    note.comments.map(&:author).uniq.each do |user|
+      if notify && user && user != @user && user.visible?
+        Notifier.note_comment_notification(comment, user).deliver_now

       end
     end
   end
       end
     end
   end