jro_apps/redmine Commit - r13274:1fcbeb6f816a

Use named routes or helpers....

Jean-Philippe Lang -

r13274:1fcbeb6f816a

parent child

Context file:

r13274:1fcbeb6f816a

Collapse all files

app/helpers/attachments_helper.rb +1 -1

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2014  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             module AttachmentsHelper
               # Displays view/delete links to the attachments of the given object
               # Options:
               #   :author -- author names are not displayed if set to false
               #   :thumbails -- display thumbnails if enabled in settings
               def link_to_attachments(container, options = {})
                 options.assert_valid_keys(:author, :thumbnails)
                 if container.attachments.any?
                   options = {:deletable => container.attachments_deletable?, :author => true}.merge(options)
                   render :partial => 'attachments/links',
                     :locals => {:attachments => container.attachments, :options => options, :thumbnails => (options[:thumbnails] && Setting.thumbnails_enabled?)}
                 end
               end
               def render_api_attachment(attachment, api)
                 api.attachment do
                   api.id attachment.id
                   api.filename attachment.filename
                   api.filesize attachment.filesize
                   api.content_type attachment.content_type
                   api.description attachment.description
-                  api.content_url url_for(:controller => 'attachments', :action => 'download', :id => attachment, :filename => attachment.filename, :only_path => false)
+                  api.content_url download_named_attachment_url(attachment, attachment.filename)
                   api.author(:id => attachment.author.id, :name => attachment.author.name) if attachment.author
                   api.created_on attachment.created_on
                 end
               end
             end

app/views/common/feed.atom.builder +1 -1

             xml.instruct!
             xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
               xml.title   truncate_single_line_raw(@title, 100)
               xml.link    "rel" => "self", "href" => url_for(params.merge(:only_path => false))
               xml.link    "rel" => "alternate", "href" => url_for(params.merge(:only_path => false, :format => nil, :key => nil))
-              xml.id      url_for(:controller => 'welcome', :only_path => false)
+              xml.id      home_url
               xml.icon    favicon_url
               xml.updated((@items.first ? @items.first.event_datetime : Time.now).xmlschema)
               xml.author  { xml.name "#{Setting.app_title}" }
               xml.generator(:uri => Redmine::Info.url) { xml.text! Redmine::Info.app_name; }
               @items.each do |item|
                 xml.entry do
                   url = url_for(item.event_url(:only_path => false))
                   if @project
                     xml.title truncate_single_line_raw(item.event_title, 100)
                   else
                     xml.title truncate_single_line_raw("#{item.project} - #{item.event_title}", 100)
                   end
                   xml.link "rel" => "alternate", "href" => url
                   xml.id url
                   xml.updated item.event_datetime.xmlschema
                   author = item.event_author if item.respond_to?(:event_author)
                   xml.author do
                     xml.name(author)
                     xml.email(author.mail) if author.is_a?(User) && !author.mail.blank? && !author.pref.hide_mail
                   end if author
                   xml.content "type" => "html" do
                     xml.text! textilizable(item, :event_description, :only_path => false)
                   end
                 end
               end
             end

app/views/journals/index.builder +4 -4

             xml.instruct!
             xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
               xml.title   @title
               xml.link    "rel" => "self", "href" => url_for(:format => 'atom', :key => User.current.rss_key, :only_path => false)
-              xml.link    "rel" => "alternate", "href" => home_url(:only_path => false)
+              xml.link    "rel" => "alternate", "href" => home_url
-              xml.id      url_for(:controller => 'welcome', :only_path => false)
+              xml.id      home_url
               xml.icon    favicon_url
               xml.updated((@journals.first ? @journals.first.event_datetime : Time.now).xmlschema)
               xml.author  { xml.name "#{Setting.app_title}" }
               @journals.each do |change|
                 issue = change.issue
                 xml.entry do
                   xml.title   "#{issue.project.name} - #{issue.tracker.name} ##{issue.id}: #{issue.subject}"
-                  xml.link    "rel" => "alternate", "href" => url_for(:controller => 'issues' , :action => 'show', :id => issue, :only_path => false)
+                  xml.link    "rel" => "alternate", "href" => issue_url(issue)
-                  xml.id      url_for(:controller => 'issues' , :action => 'show', :id => issue, :journal_id => change, :only_path => false)
+                  xml.id      issue_url(issue, :journal_id => change)
                   xml.updated change.created_on.xmlschema
                   xml.author do
                     xml.name change.user.name
                     xml.email(change.user.mail) if change.user.is_a?(User) && !change.user.mail.blank? && !change.user.pref.hide_mail
                   end
                   xml.content "type" => "html" do
                     xml.text! '<ul>'
                     details_to_strings(change.details, false).each do |string|
                       xml.text! '<li>' + string + '</li>'
                     end
                     xml.text! '</ul>'
                     xml.text! textilizable(change, :notes, :only_path => false) unless change.notes.blank?
                   end
                 end
               end
             end

app/views/mailer/reminder.html.erb +1 -1

             <p><%= l(:mail_body_reminder, :count => @issues.size, :days => @days) %></p>
             <ul>
             <% @issues.each do |issue| -%>
-              <li><%=h issue.project %> - <%=link_to(h("#{issue.tracker} ##{issue.id}"), :controller => 'issues', :action => 'show', :id => issue, :only_path => false)%>: <%=h issue.subject %></li>
+              <li><%= link_to_issue(issue, :project => true, :only_path => false) %></li>
             <% end -%>
             </ul>
             <p><%= link_to l(:label_issue_view_all), @issues_url %></p>

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