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

Fix the changeset feed to put the description in as raw HTML so we

Browse source 
can include links instead of having to create a separate link free
version of it.
This commit is contained in:
Tom Hughes 2009-07-30 11:25:33 +00:00
parent b06b6c2ce9
commit 4afacf3410
2 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/changeset_controller.rb
View file

@ -278,8 +278,6 @@ class ChangesetController < ApplicationController
bbox = params[:minlon] + ',' + params[:minlat] + ',' + params[:maxlon] + ',' + params[:maxlat] bbox = params[:minlon] + ',' + params[:minlat] + ',' + params[:maxlon] + ',' + params[:maxlat]
end end
user_link = bbox_link = nil
if bbox if bbox
conditions = cond_merge conditions, conditions_bbox(bbox) conditions = cond_merge conditions, conditions_bbox(bbox)
bbox = BoundingBox.from_s(bbox) bbox = BoundingBox.from_s(bbox)
@ -294,22 +292,18 @@ class ChangesetController < ApplicationController
@title = t 'changeset.list.title_user_bbox', :user => user.display_name, :bbox => bbox.to_s @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 @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 = 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 elsif user
@title = t 'changeset.list.title_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 @heading = t 'changeset.list.heading_user', :user => user.display_name
@description = t 'changeset.list.description_user', :user => user_link @description = t 'changeset.list.description_user', :user => user_link
@description_plain = t 'changeset.list.description_user', :user => user.display_name
elsif bbox elsif bbox
@title = t 'changeset.list.title_bbox', :bbox => bbox.to_s @title = t 'changeset.list.title_bbox', :bbox => bbox.to_s
@heading = t 'changeset.list.heading_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 = t 'changeset.list.description_bbox', :bbox => bbox_link
@description_plain = t 'changeset.list.description_bbox', :bbox => bbox.to_s
else else
@title = t 'changeset.list.title' @title = t 'changeset.list.title'
@heading = t 'changeset.list.heading' @heading = t 'changeset.list.heading'
@description = t 'changeset.list.description' @description = t 'changeset.list.description'
@description_plain = @description
end end
@edit_pages, @edits = paginate(:changesets, @edit_pages, @edits = paginate(:changesets,

4
app/views/changeset/list.atom.builder
View file

@ -5,7 +5,9 @@ atom_feed(:language => I18n.locale, :schema_date => 2009,
feed.title @title feed.title @title
feed.subtitle :type => 'xhtml' do |xhtml| feed.subtitle :type => 'xhtml' do |xhtml|
xhtml.p @description_plain xhtml.p do |p|
p << @description
end
end end
feed.updated @edits.map {|e| [e.created_at, e.closed_at].max }.max feed.updated @edits.map {|e| [e.created_at, e.closed_at].max }.max