Qualify SCALE properly - apparently object visibility when running the

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

diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index f02718cc957e9a409b309aba0627ae85d878ff4b..e451f6d04904f80467620e16f612db6ac1cadc39 100644 (file)
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -278,38 +278,32 @@ class ChangesetController < ApplicationController
       bbox = params[:minlon] + ',' + params[:minlat] + ',' + params[:maxlon] + ',' + params[:maxlat]
     end
 
       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)
     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
     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
     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
     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
     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'
     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,
     end
 
     @edit_pages, @edits = paginate(:changesets,