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 3af1f3ab9e03b1fac3e336e67d75928887b839a1..e451f6d04904f80467620e16f612db6ac1cadc39 100644 (file)
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -265,7 +265,8 @@ class ChangesetController < ApplicationController
         else
           conditions = cond_merge conditions, ['false']
         end
         else
           conditions = cond_merge conditions, ['false']
         end

-      elsif params[:format] == 'rhtml'
+      elsif request.format == :html
+        @title = t 'user.no_such_user.title'

         @not_found_user = params[:display_name]
         render :template => 'user/no_such_user', :status => :not_found
       end
         @not_found_user = params[:display_name]
         render :template => 'user/no_such_user', :status => :not_found
       end


@@ -280,16 +281,28 @@ class ChangesetController < ApplicationController
     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
+      user_link = render_to_string :partial => "user", :object => user

     end
 
     if user and bbox
     end
 
     if user and bbox

-      @description = t 'changeset.list.description_user_bbox', :user => user.display_name, :bbox => bbox_link
+      @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

     elsif user
     elsif user

-      @description = t 'changeset.list.description_user', :user => user.display_name
+      @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 bbox
     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
     else
       @description = t 'changeset.list.description_bbox', :bbox => bbox_link
     else

+      @title =  t 'changeset.list.title'
+      @heading =  t 'changeset.list.heading'

       @description = t 'changeset.list.description'
     end
 
       @description = t 'changeset.list.description'
     end