diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-04-27 08:20:53 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-04-27 08:20:53 +0000 |
| commit | 6a3236daea38f0cf8b62ccf9f1212eb0f0395b08 (patch) | |
| tree | 2b9a25638bce6626be1fb77c71dc4667653cea52 /app/views | |
| parent | ffbdc6b25bdce8abe83ee165b7a2ad6c7171f74b (diff) | |
| download | redmine-6a3236daea38f0cf8b62ccf9f1212eb0f0395b08.tar.gz redmine-6a3236daea38f0cf8b62ccf9f1212eb0f0395b08.zip | |
Include subprojects versions on calendar and gantt (#1116).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1364 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/common/_calendar.rhtml | 7 | ||||
| -rw-r--r-- | app/views/projects/gantt.rhtml | 10 |
2 files changed, 12 insertions, 5 deletions
diff --git a/app/views/common/_calendar.rhtml b/app/views/common/_calendar.rhtml index 7534a1223..1095cd501 100644 --- a/app/views/common/_calendar.rhtml +++ b/app/views/common/_calendar.rhtml @@ -19,12 +19,15 @@ while day <= calendar.enddt %> elsif day == i.due_date image_tag('arrow_to.png') end %> - <%= h("#{i.project.name} -") unless @project && @project == i.project %> + <%= h("#{i.project} -") unless @project && @project == i.project %> <%= link_to_issue i %>: <%= h(truncate(i.subject, 30)) %> <span class="tip"><%= render_issue_tooltip i %></span> </div> <% else %> - <%= link_to_version i, :class => "icon icon-package" %> + <span class="icon icon-package"> + <%= h("#{i.project} -") unless @project && @project == i.project %> + <%= link_to_version i%> + </span> <% end %> <% end %> </td> diff --git a/app/views/projects/gantt.rhtml b/app/views/projects/gantt.rhtml index 05bd4b9bc..d941d2777 100644 --- a/app/views/projects/gantt.rhtml +++ b/app/views/projects/gantt.rhtml @@ -70,10 +70,13 @@ top = headers_height + 8 @events.each do |i| %> <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.name} -") unless @project && @project == i.project %> + <%= h("#{i.project} -") unless @project && @project == i.project %> <%= link_to_issue i %>: <%=h i.subject %> <% else %> - <%= link_to_version i, :class => "icon icon-package" %> + <span class="icon icon-package"> + <%= h("#{i.project} -") unless @project && @project == i.project %> + <%= link_to_version i %> + </span> <% end %> </small></div> <% top = top + 20 @@ -197,7 +200,8 @@ top = headers_height + 10 %> <div style="top:<%= top %>px;left:<%= i_left %>px;width:15px;" class="task milestone"> </div> <div style="top:<%= top %>px;left:<%= i_left + 12 %>px;background:#fff;" class="task"> - <strong><%= i.name %></strong> + <%= h("#{i.project} -") unless @project && @project == i.project %> + <strong><%=h i %></strong> </div> <% end %> <% top = top + 20 |