Added referer URL in user_token so that redirections (e.g: from oauth token requests...

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

diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index f02718cc957e9a409b309aba0627ae85d878ff4b..c67f4abd5e69c81a7ae68f860abbc5476f1a0193 100644 (file)
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -7,6 +7,7 @@ class ChangesetController < ApplicationController
   before_filter :authorize_web, :only => [:list, :list_user, :list_bbox]
   before_filter :set_locale, :only => [:list, :list_user, :list_bbox]
   before_filter :authorize, :only => [:create, :update, :delete, :upload, :include, :close]
+  before_filter :require_allow_write_api, :only => [:create, :update, :delete, :upload, :include, :close]
   before_filter :require_public_data, :only => [:create, :update, :delete, :upload, :include, :close]
   before_filter :check_api_writable, :only => [:create, :update, :delete, :upload, :include]
   before_filter :check_api_readable, :except => [:create, :update, :delete, :upload, :download, :query]
@@ -278,38 +279,32 @@ class ChangesetController < ApplicationController
       bbox = params[:minlon] + ',' + params[:minlat] + ',' + params[:maxlon] + ',' + params[:maxlat]
     end
 
-    user_link = bbox_link = nil
-
     if bbox
       conditions = cond_merge conditions, conditions_bbox(bbox)
       bbox = BoundingBox.from_s(bbox)
-      bbox_link = "<a href='#{url_for(:controller => "site", :action => "index", :minlon => bbox.min_lon, :minlat => bbox.min_lat, :maxlon => bbox.max_lon, :maxlat => bbox.max_lat, :box => "yes")}'>#{bbox.to_s}</a>"
+      bbox_link = render_to_string :partial => "bbox", :object => bbox
     end
 
     if user
-      user_link = "<a href='#{url_for(:controller => "user", :action => "view", :display_name => user.display_name)}'>#{user.display_name}</a>"
+      user_link = render_to_string :partial => "user", :object => user
     end
 
     if user and bbox
       @title =  t 'changeset.list.title_user_bbox', :user => user.display_name, :bbox => bbox.to_s
       @heading =  t 'changeset.list.heading_user_bbox', :user => user.display_name, :bbox => bbox.to_s
       @description = t 'changeset.list.description_user_bbox', :user => user_link, :bbox => bbox_link
-      @description_plain = t 'changeset.list.description_user_bbox', :user => user.display_name, :bbox => bbox.to_s
     elsif user
       @title =  t 'changeset.list.title_user', :user => user.display_name
       @heading =  t 'changeset.list.heading_user', :user => user.display_name
       @description = t 'changeset.list.description_user', :user => user_link
-      @description_plain = t 'changeset.list.description_user', :user => user.display_name
     elsif bbox
       @title =  t 'changeset.list.title_bbox', :bbox => bbox.to_s
       @heading =  t 'changeset.list.heading_bbox', :bbox => bbox.to_s
       @description = t 'changeset.list.description_bbox', :bbox => bbox_link
-      @description_plain = t 'changeset.list.description_bbox', :bbox => bbox.to_s
     else
       @title =  t 'changeset.list.title'
       @heading =  t 'changeset.list.heading'
       @description = t 'changeset.list.description'
-      @description_plain = @description
     end
 
     @edit_pages, @edits = paginate(:changesets,