Fixup some error handling in map bugs

[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 596ec4d5c58cafec2f4c019304196884de5bc352..16d127641493236b78dd8dc7e183f38f29cbd1f8 100644 (file)
--- a/app/controllers/map_bugs_controller.rb
+++ b/app/controllers/map_bugs_controller.rb
@@ -100,6 +100,8 @@ class MapBugsController < ApplicationController
        id = params['id'].to_i
 
        bug = MapBug.find_by_id(id);
        id = params['id'].to_i
 
        bug = MapBug.find_by_id(id);

+       raise OSM::APINotFoundError unless bug
+       raise OSM::APIAlreadyDeletedError unless bug.visible

 
        bug_comment = add_comment(bug, params['text'], name);
 
 
        bug_comment = add_comment(bug, params['text'], name);
 


@@ -112,6 +114,9 @@ class MapBugsController < ApplicationController
        id = params['id'].to_i
 
        bug = MapBug.find_by_id(id);
        id = params['id'].to_i
 
        bug = MapBug.find_by_id(id);

+       raise OSM::APINotFoundError unless bug
+       raise OSM::APIAlreadyDeletedError unless bug.visible
+

        bug.close_bug;
 
        render_ok
        bug.close_bug;
 
        render_ok


@@ -130,9 +135,11 @@ class MapBugsController < ApplicationController
 
   def read
        @bug = MapBug.find(params['id'])
 
   def read
        @bug = MapBug.find(params['id'])

-    render :text => "", :status => :gone unless @bug.visible
+       raise OSM::APINotFoundError unless @bug
+       raise OSM::APIAlreadyDeletedError unless @bug.visible
+

        respond_to do |format|
        respond_to do |format|

-         format.rss
+         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]}}) }       
        end
          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]}}) }       
        end


@@ -140,6 +147,8 @@ class MapBugsController < ApplicationController
 
   def delete
        bug = MapBug.find(params['id'])
 
   def delete
        bug = MapBug.find(params['id'])

+       raise OSM::APINotFoundError unless @bug
+       raise OSM::APIAlreadyDeletedError unless @bug.visible

        bug.status = "hidden"
        bug.save
        render :text => "ok\n", :content_type => "text/html" 
        bug.status = "hidden"
        bug.save
        render :text => "ok\n", :content_type => "text/html"