jro_apps/redmine Commit - r2926:cbeeaa4d4d47

app/helpers/application_helper.rb +22 -2

@@ -58,9 +58,29 module ApplicationHelper
58	end	58	end
59	end	59	end
60		60
		61	# Displays a link to +issue+ with its subject.
		62	# Examples:
		63	#
		64	# link_to_issue(issue) # => Defect #6: This is the subject
		65	# link_to_issue(issue, :truncate => 6) # => Defect #6: This i...
		66	# link_to_issue(issue, :subject => false) # => Defect #6
		67	#
61	def link_to_issue(issue, options={})	68	def link_to_issue(issue, options={})
62	options[:class] \|\|= issue.css_classes	69	title = nil
63	link_to "#{issue.tracker.name} ##{issue.id}", {:controller => "issues", :action => "show", :id => issue}, options	70	subject = nil
		71	if options[:subject] == false
		72	title = truncate(issue.subject, :length => 60)
		73	else
		74	subject = issue.subject
		75	if options[:truncate]
		76	subject = truncate(subject, :length => options[:truncate])
		77	end
		78	end
		79	s = link_to "#{issue.tracker} ##{issue.id}", {:controller => "issues", :action => "show", :id => issue},
		80	:class => issue.css_classes,
		81	:title => title
		82	s << ": #{h subject}" if subject
		83	s
64	end	84	end
65		85
66	# Generates a link to an attachment.	86	# Generates a link to an attachment.

app/helpers/issues_helper.rb +1 -1

                 @cached_label_assigned_to ||= l(:field_assigned_to)
                 @cached_label_priority ||= l(:field_priority)
-                link_to_issue(issue) + ": #{h(issue.subject)}<br /><br />" +
+                link_to_issue(issue) + "<br /><br />" +
                   "<strong>#{@cached_label_start_date}</strong>: #{format_date(issue.start_date)}<br />" +
                   "<strong>#{@cached_label_due_date}</strong>: #{format_date(issue.due_date)}<br />" +
                   "<strong>#{@cached_label_assigned_to}</strong>: #{issue.assigned_to}<br />" +

app/helpers/timelog_helper.rb +1 -1

                 links = []
                 links << link_to(l(:label_project_all), {:project_id => nil, :issue_id => nil})
                 links << link_to(h(@project), {:project_id => @project, :issue_id => nil}) if @project
-                links << link_to_issue(@issue) if @issue
+                links << link_to_issue(@issue, :subject => false) if @issue
                 breadcrumb links
               end

app/views/common/_calendar.rhtml +1 -1

             		image_tag('arrow_to.png')
                   end %>
               <%= h("#{i.project} -") unless @project && @project == i.project %>
-              <%= link_to_issue i %>: <%= h(truncate(i.subject, :length => 30)) %>
+              <%= link_to_issue i, :truncate => 30 %>
               <span class="tip"><%= render_issue_tooltip i %></span>
               </div>
               <% else %>

app/views/issues/_relations.rhtml +3 -2

             <% @issue.relations.select {|r| r.other_issue(@issue).visible? }.each do |relation| %>
             <tr>
             <td><%= l(relation.label_for(@issue)) %> <%= "(#{l('datetime.distance_in_words.x_days', :count => relation.delay)})" if relation.delay && relation.delay != 0 %>
-                <%= h(relation.other_issue(@issue).project) + ' - ' if Setting.cross_project_issue_relations? %> <%= link_to_issue relation.other_issue(@issue) %></td>
+                <%= h(relation.other_issue(@issue).project) + ' - ' if Setting.cross_project_issue_relations? %>
-            <td><%=h relation.other_issue(@issue).subject %></td>
+                <%= link_to_issue relation.other_issue(@issue) %>
+            </td>
             <td><%= relation.other_issue(@issue).status.name %></td>
             <td><%= format_date(relation.other_issue(@issue).start_date) %></td>
             <td><%= format_date(relation.other_issue(@issue).due_date) %></td>

app/views/issues/gantt.rhtml +1 -1

                 <div style="position: absolute;line-height:1.2em;height:16px;top:<%= top %>px;left:4px;overflow:hidden;"><small>
                 <% if i.is_a? Issue %>
                   	<%= h("#{i.project} -") unless @project && @project == i.project %>
-                  	<%= link_to_issue i %>:	<%=h i.subject %>
+                  	<%= link_to_issue i %>
               	<% else %>
             		<span class="icon icon-package">
             	      	<%= h("#{i.project} -") unless @project && @project == i.project %>

app/views/my/blocks/_timelog.rhtml +1 -1

                 <% entries_by_day[day].each do |entry| -%>
                 <tr class="time-entry" style="border-bottom: 1px solid #f5f5f5;">
                 <td class="activity"><%=h entry.activity %></td>
-                <td class="subject"><%=h entry.project %> <%= ' - ' + link_to_issue(entry.issue, :title => h("#{entry.issue.subject} (#{entry.issue.status})")) if entry.issue %></td>
+                <td class="subject"><%=h entry.project %> <%= ' - ' + link_to_issue(entry.issue, :truncate => 50) if entry.issue %></td>
                 <td class="comments"><%=h entry.comments %></td>
                 <td class="hours"><%= html_hours("%.2f" % entry.hours) %></td>
                 <td align="center">

app/views/projects/changelog.rhtml +1 -1

                 <% if !issues.empty? %>
                 <ul>
                   <% issues.each do |issue| %>
-                    <li><%= link_to_issue(issue) %>: <%=h issue.subject %></li>
+                    <li><%= link_to_issue(issue) %></li>
                   <% end %>
                 </ul>
                 <% end %>

app/views/projects/roadmap.rhtml +1 -1

                 <fieldset class="related-issues"><legend><%= l(:label_related_issues) %></legend>
                 <ul>
                 <%- issues.each do |issue| -%>
-                    <li><%= link_to_issue(issue) %>: <%=h issue.subject %></li>
+                    <li><%= link_to_issue(issue) %></li>
                 <%- end -%>
                 </ul>
                 </fieldset>

app/views/repositories/revision.rhtml +1 -1

             <h3><%= l(:label_related_issues) %></h3>
             <ul>
             <% @changeset.issues.visible.each do |issue| %>
-              <li><%= link_to_issue issue %>: <%=h issue.subject %></li>
+              <li><%= link_to_issue issue %></li>
             <% end %>
             </ul>
             <% end %>

app/views/timelog/_list.rhtml +1 -1

             <td class="project"><%=h entry.project %></td>
             <td class="subject">
             <% if entry.issue -%>
-            <%= link_to_issue entry.issue %>: <%= h(truncate(entry.issue.subject, :length => 50)) -%>
+            <%= link_to_issue entry.issue, :truncate => 50 -%>
             <% end -%>
             </td>
             <td class="comments"><%=h entry.comments %></td>

app/views/versions/show.rhtml +1 -1

             <fieldset class="related-issues"><legend><%= l(:label_related_issues) %></legend>
             <ul>
             <% issues.each do |issue| -%>
-                <li><%= link_to_issue(issue) %>: <%=h issue.subject %></li>
+                <li><%= link_to_issue(issue) %></li>
             <% end -%>
             </ul>
             </fieldset>

	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