cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix various auth bugs with the changeset listing stuff, catch exception (but not yet handled well) for when edits not public.

Browse source
This commit is contained in:
Thomas Wood 2009-03-23 18:23:37 +00:00
parent d3c6087409
commit 677f391ec1
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/controllers/changeset_controller.rb
View file

@ -4,8 +4,8 @@ class ChangesetController < ApplicationController
layout 'site' layout 'site'
require 'xml/libxml' require 'xml/libxml'
session :off, :except => [:list] session :off, :except => [:list, :list_user, :list_bbox]
before_filter :authorize_web, :only => [:list] before_filter :authorize_web, :only => [:list, :list_user, :list_bbox]
before_filter :authorize, :only => [:create, :update, :delete, :upload, :include, :close] before_filter :authorize, :only => [:create, :update, :delete, :upload, :include, :close]
before_filter :check_write_availability, :only => [:create, :update, :delete, :upload, :include] before_filter :check_write_availability, :only => [:create, :update, :delete, :upload, :include]
before_filter :check_read_availability, :except => [:create, :update, :delete, :upload, :download, :query] before_filter :check_read_availability, :except => [:create, :update, :delete, :upload, :download, :query]
@ -323,7 +323,12 @@ class ChangesetController < ApplicationController
#find user by display name #find user by display name
user = User.find(:first, :conditions => [ "visible = ? and display_name = ?", true, params[: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 conditions = cond_merge conditions, conditions_nonempty
@edit_pages, @edits = paginate(:changesets, @edit_pages, @edits = paginate(:changesets,
:include => [:user, :changeset_tags], :include => [:user, :changeset_tags],