jro_apps/redmine Commit - r1477:4db45b8ceddf

Fixed: changesets titles should not be multiline in atom feeds (#1356)....

Jean-Philippe Lang -

r1477:4db45b8ceddf

parent child

Context file:

r1477:4db45b8ceddf

Collapse all files

app/helpers/application_helper.rb +9 -2

                 include_date ? local.strftime("#{@date_format} #{@time_format}") : local.strftime(@time_format)
               end
+              # Truncates and returns the string as a single line
+              def truncate_single_line(string, *args)
+                truncate(string, *args).gsub(%r{[\r\n]+}m, ' ')
+              end
               def html_hours(text)
                 text.gsub(%r{(\d+)\.(\d+)}, '<span class="hours hours-int">\1</span><span class="hours hours-dec">.\2</span>')
               end
                       if project && (changeset = project.changesets.find_by_revision(oid))
                         link = link_to("r#{oid}", {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project, :rev => oid},
                                                   :class => 'changeset',
-                                                  :title => truncate(changeset.comments, 100))
+                                                  :title => truncate_single_line(changeset.comments, 100))
                       end
                     elsif sep == '#'
                       oid = oid.to_i
                         end
                       when 'commit'
                         if project && (changeset = project.changesets.find(:first, :conditions => ["scmid LIKE ?", "#{name}%"]))
-                          link = link_to h("#{name}"), {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project, :rev => changeset.revision}, :class => 'changeset', :title => truncate(changeset.comments, 100)
+                          link = link_to h("#{name}"), {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project, :rev => changeset.revision},
+                                                       :class => 'changeset',
+                                                       :title => truncate_single_line(changeset.comments, 100)
                         end
                       when 'source', 'export'
                         if project && project.repository

app/helpers/projects_helper.rb +4 0

                 link_to h(version.name), { :controller => 'versions', :action => 'show', :id => version }, options
               end
+              def format_activity_title(text)
+                h(truncate_single_line(text, 100))
+              end
               def format_activity_day(date)
                 date == Date.today ? l(:label_today).titleize : format_date(date)
               end

app/views/common/feed.atom.rxml +2 -2

             xml.instruct!
             xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
-              xml.title   @title
+              xml.title   truncate_single_line(@title, 100)
               xml.link    "rel" => "self", "href" => url_for(params.merge({:format => nil, :only_path => false}))
               xml.link    "rel" => "alternate", "href" => url_for(:controller => 'welcome', :only_path => false)
               xml.id      url_for(:controller => 'welcome', :only_path => false)
               @items.each do |item|
                 xml.entry do
                   url = url_for(item.event_url(:only_path => false))
-                  xml.title truncate(item.event_title, 100)
+                  xml.title truncate_single_line(item.event_title, 100)
                   xml.link "rel" => "alternate", "href" => url
                   xml.id url
                   xml.updated item.event_datetime.xmlschema

app/views/projects/activity.rhtml +2 -1

             <dl>
             <% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%>
               <dt class="<%= e.event_type %>"><span class="time"><%= format_time(e.event_datetime, false) %></span>
-              <%= content_tag('span', h(e.project), :class => 'project') if @project.nil? || @project != e.project %> <%= link_to h(truncate(e.event_title, 100)), e.event_url %></dt>
+              <%= content_tag('span', h(e.project), :class => 'project') if @project.nil? || @project != e.project %>
+              <%= link_to format_activity_title(e.event_title), e.event_url %></dt>
               <dd><span class="description"><%= format_activity_description(e.event_description) %></span>
               <span class="author"><%= e.event_author if e.respond_to?(:event_author) %></span></dd>
             <% end -%>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages