X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/6aec21b5b86a9bfa1a9d60a1491bda6c597467b0..f4928d0e952ddbde662517d781367dd97eab86a7:/app/controllers/map_bugs_controller.rb

diff --git a/app/controllers/map_bugs_controller.rb b/app/controllers/map_bugs_controller.rb
index 158bf435a..28d22c3f3 100644
--- 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']
 
@@ -37,21 +36,21 @@ class MapBugsController < ApplicationController
     limit = getLimit
     conditions = closedCondition
 	
-    check_boundaries(@min_lon, @min_lat, @max_lon, @max_lat, :false)
+    check_boundaries(@min_lon, @min_lat, @max_lon, @max_lat, MAX_BUG_REQUEST_AREA)
 
-    @bugs = MapBug.find_by_area_no_quadtile(@min_lat, @min_lon, @max_lat, @max_lon, :include => :map_bug_comment, :order => "last_changed DESC", :limit => limit, :conditions => conditions)
+    @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.json { render :json => @bugs.to_json(:methods => [:lat, :lon], :only => [:id, :status, :date_created], :include => { :map_bug_comment => { :only => [:commenter_name, :date_created, :comment]}}) }	  
-      format.gpx {render :template => 'map_bugs/get_bugs.gpx'}
+      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/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']
@@ -80,15 +79,16 @@ class MapBugsController < ApplicationController
       rescue Exception => err
         @bug.nearby_place = "unknown"
       end
-	  
+
       @bug.save
-      add_comment(@bug, comment, name,"opened")
+
+      add_comment(@bug, comment, name, "opened")
     end
  
     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']
 
@@ -102,13 +102,13 @@ class MapBugsController < ApplicationController
     raise OSM::APIAlreadyDeletedError unless bug.visible
 
     MapBug.transaction do
-      bug_comment = add_comment(bug, params['text'], name,"commented")
+      bug_comment = add_comment(bug, params['text'], name, "commented")
     end
 
     render_ok
   end
 
-  def close_bug
+  def close
     raise OSM::APIBadUserInput.new("No id was given") unless params['id']
 	
     id = params['id'].to_i
@@ -121,33 +121,29 @@ class MapBugsController < ApplicationController
 
     MapBug.transaction do
       bug.close_bug
-      add_comment(bug,:nil,name,"closed")
+      add_comment(bug, :nil, name, "closed")
     end
 
     render_ok
   end 
 
   def rss
+    limit = getLimit
+    conditions = closedCondition
+
     # Figure out the bbox
     bbox = params['bbox']
 
     if bbox and bbox.count(',') == 3
       bbox = bbox.split(',')
       @min_lon, @min_lat, @max_lon, @max_lat = sanitise_boundaries(bbox)
-    else
-      @min_lon = -180.0
-      @min_lat = -90.0
-      @max_lon = 180.0
-      @max_lat = 90.0
-    end
 
-    limit = getLimit
-    conditions = closedCondition
-    conditions = cond_merge conditions, [OSM.sql_for_area_no_quadtile(@min_lat, @min_lon, @max_lat, @max_lon)]
-       
-    check_boundaries(@min_lon, @min_lat, @max_lon, @max_lat, :false)
+      check_boundaries(@min_lon, @min_lat, @max_lon, @max_lat, MAX_BUG_REQUEST_AREA)
+
+      conditions = cond_merge conditions, [OSM.sql_for_area(@min_lat, @min_lon, @max_lat, @max_lon)]
+    end
 
-    @comments = MapBugComment.find(:all, :limit => limit, :order => "date_created DESC", :joins => :map_bug, :include => :map_bug, :conditions => conditions)
+    @comments = MapBugComment.find(:all, :limit => limit, :order => "created_at DESC", :joins => :map_bug, :include => :map_bug, :conditions => conditions)
     render :template => 'map_bugs/rss.rss'
   end
 
@@ -159,7 +155,7 @@ class MapBugsController < ApplicationController
     respond_to do |format|
       format.rss
       format.xml
-      format.json { render :json => @bug.to_json(:methods => [:lat, :lon], :only => [:id, :status, :date_created], :include => { :map_bug_comment => { :only => [:commenter_name, :date_created, :comment]}}) }	  
+      format.json { render :json => @bug.to_json(:methods => [:lat, :lon], :only => [:id, :status, :created_at], :include => { :comments => { :only => [:author_name, :created_at, :body]}}) }	  
       format.gpx
     end
   end
@@ -182,30 +178,30 @@ class MapBugsController < ApplicationController
     raise OSM::APIBadUserInput.new("No query string was given") unless params['q']
     limit = getLimit
     conditions = closedCondition
-    conditions = cond_merge conditions, ['map_bug_comment.comment ~ ?', params['q']]
+    conditions = cond_merge conditions, ['map_bug_comment.body ~ ?', params['q']]
 	
     #TODO: There should be a better way to do this.   CloseConditions are ignored at the moment
 
-    bugs2 = MapBug.find(:all, :limit => limit, :order => "last_changed DESC", :joins => :map_bug_comment, :include => :map_bug_comment,
+    bugs2 = MapBug.find(:all, :limit => limit, :order => "updated_at DESC", :joins => :comments, :include => :comments,
                         :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.json { render :json => @bugs.to_json(:methods => [:lat, :lon], :only => [:id, :status, :date_created], :include => { :map_bug_comment => { :only => [:commenter_name, :date_created, :comment]}}) }
-      format.gpx {render :template => 'map_bugs/get_bugs.gpx'}
+      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/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"] }) 
  
       if @user2  
         if @user2.data_public? or @user2 == @user 
-          conditions = ['map_bug_comment.commenter_id = ?', @user2.id] 
+          conditions = ['map_bug_comment.author_id = ?', @user2.id] 
         else 
           conditions = ['false'] 
         end 
@@ -229,9 +225,9 @@ class MapBugsController < ApplicationController
     @page_size = 10
 
     @bugs = MapBug.find(:all, 
-                        :include => [:map_bug_comment, {:map_bug_comment => :user}],
-                        :joins => :map_bug_comment,
-                        :order => "last_changed DESC",
+                        :include => [:comments, {:comments => :author}],
+                        :joins => :comments,
+                        :order => "updated_at DESC",
                         :conditions => conditions,
                         :offset => (@page - 1) * @page_size, 
                         :limit => @page_size).uniq
@@ -282,7 +278,7 @@ private
     if closed_since < 0
       conditions = ["status != 'hidden'"]
     elsif closed_since > 0
-      conditions = ["((status = 'open') OR ((status = 'closed' ) AND (date_closed > '" + (Time.now - closed_since.days).to_s + "')))"]
+      conditions = ["((status = 'open') OR ((status = 'closed' ) AND (closed_at > '" + (Time.now - closed_since.days).to_s + "')))"]
     else
       conditions = ["status = 'open'"]
     end
@@ -291,26 +287,24 @@ private
   end
 
   def add_comment(bug, comment, name,event) 
-    t = Time.now.getutc 
-    bug_comment = bug.map_bug_comment.create(:date_created => t, :visible => true, :event => event)
-    bug_comment.comment = comment unless comment == :nil
+    bug_comment = bug.comments.create(:visible => true, :event => event)
+    bug_comment.body = comment unless comment == :nil
     if @user  
-      bug_comment.commenter_id = @user.id
-      bug_comment.commenter_name = @user.display_name
+      bug_comment.author_id = @user.id
+      bug_comment.author_name = @user.display_name
     else  
-      bug_comment.commenter_ip = request.remote_ip
-      bug_comment.commenter_name = name + " (a)"
+      bug_comment.author_ip = request.remote_ip
+      bug_comment.author_name = name + " (a)"
     end
     bug_comment.save 
-    bug.last_changed = t 
     bug.save
 
     sent_to = Set.new
-    bug.map_bug_comment.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)
+    bug.comments.each do | cmt |
+      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