Rename a number of methods in the map_bugs controller

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

diff --git a/app/controllers/map_bugs_controller.rb b/app/controllers/map_bugs_controller.rb
index 8bd45bbcdefc3ec571eeb21ac87f972d5dd71ba8..28d22c3f36b96175652a63b9d08f3dc3c31ed55d 100644 (file)
--- a/app/controllers/map_bugs_controller.rb
+++ b/app/controllers/map_bugs_controller.rb
@@ -1,20 +1,19 @@
 class MapBugsController < ApplicationController
 
-  layout 'site', :only => [:my_bugs]
+  layout 'site', :only => [:mine]
 
   before_filter :check_api_readable
-  before_filter :authorize_web, :only => [:add_bug, :close_bug, :edit_bug, :delete, :my_bugs]
-  before_filter :check_api_writable, :only => [:add_bug, :close_bug, :edit_bug, :delete]
+  before_filter :authorize_web, :only => [:create, :close, :update, :delete, :mine]
+  before_filter :check_api_writable, :only => [:create, :close, :update, :delete]
   before_filter :require_moderator, :only => [:delete]
-  before_filter :set_locale, :only => [:my_bugs]
+  before_filter :set_locale, :only => [:mine]
   after_filter :compress_output
   around_filter :api_call_handle_error, :api_call_timeout
 
   # Help methods for checking boundary sanity and area size
   include MapBoundary
 
-  def get_bugs
-
+  def list
     # Figure out the bbox
     bbox = params['bbox']
 
@@ -42,16 +41,16 @@ class MapBugsController < ApplicationController
     @bugs = MapBug.find_by_area(@min_lat, @min_lon, @max_lat, @max_lon, :include => :comments, :order => "updated_at DESC", :limit => limit, :conditions => conditions)
 
     respond_to do |format|
-      format.html {render :template => 'map_bugs/get_bugs.js', :content_type => "text/javascript"}
-      format.rss {render :template => 'map_bugs/get_bugs.rss'}
+      format.html {render :template => 'map_bugs/list.rjs', :content_type => "text/javascript"}
+      format.rss {render :template => 'map_bugs/list.rss'}
       format.js
-      format.xml {render :template => 'map_bugs/get_bugs.xml'}
+      format.xml {render :template => 'map_bugs/list.xml'}
       format.json { render :json => @bugs.to_json(:methods => [:lat, :lon], :only => [:id, :status, :created_at], :include => { :comments => { :only => [:author_name, :created_at, :body]}}) }          
-      format.gpx {render :template => 'map_bugs/get_bugs.gpx'}
+      format.gpx {render :template => 'map_bugs/list.gpx'}
     end
   end
 
-  def add_bug
+  def create
     raise OSM::APIBadUserInput.new("No lat was given") unless params['lat']
     raise OSM::APIBadUserInput.new("No lon was given") unless params['lon']
     raise OSM::APIBadUserInput.new("No text was given") unless params['text']
@@ -89,7 +88,7 @@ class MapBugsController < ApplicationController
     render_ok
   end
 
-  def edit_bug
+  def update
     raise OSM::APIBadUserInput.new("No id was given") unless params['id']
     raise OSM::APIBadUserInput.new("No text was given") unless params['text']
 
@@ -109,7 +108,7 @@ class MapBugsController < ApplicationController
     render_ok
   end
 
-  def close_bug
+  def close
     raise OSM::APIBadUserInput.new("No id was given") unless params['id']
        
     id = params['id'].to_i
@@ -187,16 +186,16 @@ class MapBugsController < ApplicationController
                         :conditions => conditions)
     @bugs = bugs2.uniq
     respond_to do |format|
-      format.html {render :template => 'map_bugs/get_bugs.js', :content_type => "text/javascript"}
-      format.rss {render :template => 'map_bugs/get_bugs.rss'}
+      format.html {render :template => 'map_bugs/list.rjs', :content_type => "text/javascript"}
+      format.rss {render :template => 'map_bugs/list.rss'}
       format.js
-      format.xml {render :template => 'map_bugs/get_bugs.xml'}
+      format.xml {render :template => 'map_bugs/list.xml'}
       format.json { render :json => @bugs.to_json(:methods => [:lat, :lon], :only => [:id, :status, :created_at], :include => { :comments => { :only => [:author_name, :created_at, :body]}}) }
-      format.gpx {render :template => 'map_bugs/get_bugs.gpx'}
+      format.gpx {render :template => 'map_bugs/list.gpx'}
     end
   end
 
-  def my_bugs
+  def mine
     if params[:display_name] 
       @user2 = User.find_by_display_name(params[:display_name], :conditions => { :status => ["active", "confirmed"] }) 
  
@@ -226,7 +225,7 @@ class MapBugsController < ApplicationController
     @page_size = 10
 
     @bugs = MapBug.find(:all, 
-                        :include => [:comments, {:comments => :user}],
+                        :include => [:comments, {:comments => :author}],
                         :joins => :comments,
                         :order => "updated_at DESC",
                         :conditions => conditions,
@@ -302,10 +301,10 @@ private
 
     sent_to = Set.new
     bug.comments.each do | cmt |
-      if cmt.user
-        unless sent_to.include?(cmt.user)
-          Notifier.deliver_bug_comment_notification(bug_comment, cmt.user) unless cmt.user == @user
-          sent_to.add(cmt.user)
+      if cmt.author
+        unless sent_to.include?(cmt.author)
+          Notifier.deliver_bug_comment_notification(bug_comment, cmt.author) unless cmt.author == @user
+          sent_to.add(cmt.author)
         end
       end
     end