kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Subproject name displayed on issue list, calendar and gantt (only for issues that belong to a subproject). 

git-svn-id: http://redmine.rubyforge.org/svn/trunk@484 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2007-04-27 16:21:53 +00:00
parent 89db185726
commit c1a18a2889
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/projects_controller.rb
View File

@ -559,7 +559,7 @@ class ProjectsController < ApplicationController
@events = [] @events = []
@project.issues_with_subprojects(params[:with_subprojects]) do @project.issues_with_subprojects(params[:with_subprojects]) do
@events += Issue.find(:all, @events += Issue.find(:all,
:include => [:tracker, :status, :assigned_to, :priority], :include => [:tracker, :status, :assigned_to, :priority, :project],
:conditions => ["((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?)) and #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')})", @date_from, @date_to, @date_from, @date_to] :conditions => ["((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?)) and #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')})", @date_from, @date_to, @date_from, @date_to]
) unless @selected_tracker_ids.empty? ) unless @selected_tracker_ids.empty?
end end
@ -597,7 +597,7 @@ class ProjectsController < ApplicationController
@project.issues_with_subprojects(params[:with_subprojects]) do @project.issues_with_subprojects(params[:with_subprojects]) do
@events += Issue.find(:all, @events += Issue.find(:all,
:order => "start_date, due_date", :order => "start_date, due_date",
:include => [:tracker, :status, :assigned_to, :priority], :include => [:tracker, :status, :assigned_to, :priority, :project],
:conditions => ["(((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?) or (start_date<? and due_date>?)) and start_date is not null and due_date is not null and #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')}))", @date_from, @date_to, @date_from, @date_to, @date_from, @date_to] :conditions => ["(((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?) or (start_date<? and due_date>?)) and start_date is not null and due_date is not null and #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')}))", @date_from, @date_to, @date_from, @date_to, @date_from, @date_to]
) unless @selected_tracker_ids.empty? ) unless @selected_tracker_ids.empty?
end end

2
app/views/projects/calendar.rhtml
View File

@ -67,7 +67,7 @@ while day <= @date_to
elsif day == i.due_date elsif day == i.due_date
image_tag('arrow_to.png') image_tag('arrow_to.png')
end %> end %>
<small><%= link_to_issue i %>: <%=h i.subject.sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)') %></small> <small><%= link_to_issue i %><%= " (#{i.project.name})" unless @project && @project == i.project %>: <%=h i.subject.sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)') %></small>
<span class="tip"> <span class="tip">
<%= render :partial => "issues/tooltip", :locals => { :issue => i }%> <%= render :partial => "issues/tooltip", :locals => { :issue => i }%>
</span> </span>

2
app/views/projects/gantt.rhtml
View File

@ -86,7 +86,7 @@ top = headers_height + 8
@events.each do |i| %> @events.each do |i| %>
<div style="position: absolute;line-height:1.2em;height:16px;top:<%= top %>px;left:4px;overflow:hidden;"><small> <div style="position: absolute;line-height:1.2em;height:16px;top:<%= top %>px;left:4px;overflow:hidden;"><small>
<% if i.is_a? Issue %> <% if i.is_a? Issue %>
<%= link_to_issue i %>: <%= link_to_issue i %><%= " (#{i.project.name})" unless @project && @project == i.project %>:
<%=h i.subject.sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)') %> <%=h i.subject.sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)') %>
<% else %> <% else %>
<strong><%= "#{l(:label_version)}: #{i.name}" %></strong> <strong><%= "#{l(:label_version)}: #{i.name}" %></strong>

2
app/views/projects/list_issues.rhtml
View File

@ -59,7 +59,7 @@
<tr class="<%= cycle("odd", "even") %>"> <tr class="<%= cycle("odd", "even") %>">
<th style="width:15px;"><%= check_box_tag "issue_ids[]", issue.id, false, :id => "issue_#{issue.id}" %></th> <th style="width:15px;"><%= check_box_tag "issue_ids[]", issue.id, false, :id => "issue_#{issue.id}" %></th>
<td align="center"><%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %></td> <td align="center"><%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %></td>
<td align="center"><%= issue.tracker.name %></td> <td align="center"><%= issue.tracker.name %> <%= "(#{issue.project.name})" unless @project && @project == issue.project %></td>
<td><div class="square" style="background:#<%= issue.status.html_color %>;"></div> <%= issue.status.name %></td> <td><div class="square" style="background:#<%= issue.status.html_color %>;"></div> <%= issue.status.name %></td>
<td align="center"><%= issue.priority.name %></td> <td align="center"><%= issue.priority.name %></td>
<td><%= link_to h(issue.subject), :controller => 'issues', :action => 'show', :id => issue %></td> <td><%= link_to h(issue.subject), :controller => 'issues', :action => 'show', :id => issue %></td>