Fix various auth bugs with the changeset listing stuff, catch exception (but not...

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

diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index ebad59aa038a6e6145e034cd850c79817285ca45..bb628d48e1b015659e91d9b9e0cabc4ef28ca11b 100644 (file)
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -4,8 +4,8 @@ class ChangesetController < ApplicationController
   layout 'site'
   require 'xml/libxml'
 
-  session :off, :except => [:list]
-  before_filter :authorize_web, :only => [:list]
+  session :off, :except => [:list, :list_user, :list_bbox]
+  before_filter :authorize_web, :only => [:list, :list_user, :list_bbox]
   before_filter :authorize, :only => [:create, :update, :delete, :upload, :include, :close]
   before_filter :check_write_availability, :only => [:create, :update, :delete, :upload, :include]
   before_filter :check_read_availability, :except => [:create, :update, :delete, :upload, :download, :query]
@@ -323,7 +323,12 @@ class ChangesetController < ApplicationController
     #find user by display name   
     user = User.find(:first, :conditions => [ "visible = ? and display_name = ?", true, params[:display_name]])
     
-    conditions = conditions_user(user.id);
+    conditions = nil
+    begin
+      conditions = conditions_user(user.id);
+    rescue OSM::APINotFoundError
+      
+    end
     conditions = cond_merge conditions, conditions_nonempty
     @edit_pages, @edits = paginate(:changesets,
                                    :include => [:user, :changeset_tags],