jro_apps/redmine Commit - r419:0ea1b712be79

"Author" column replaced by "Assigned to" in issue list....

Jean-Philippe Lang -

r419:0ea1b712be79

parent child

Context file:

r419:0ea1b712be79

Collapse all files

app/controllers/projects_controller.rb +5 -3

                   @issue_count = Issue.count(:include => [:status, :project], :conditions => @query.statement)
                   @issue_pages = Paginator.new self, @issue_count, @results_per_page, params['page']
                   @issues = Issue.find :all, :order => sort_clause,
-              						:include => [ :author, :status, :tracker, :project, :priority ],
+              						:include => [ :assigned_to, :status, :tracker, :project, :priority ],
               						:conditions => @query.statement,
               						:limit  =>  @issue_pages.items_per_page,
               						:offset =>  @issue_pages.current.offset
                 render :action => 'list_issues' and return unless @query.valid?
                 @issues =  Issue.find :all, :order => sort_clause,
-            						:include => [ :author, :status, :tracker, :priority, {:custom_values => :custom_field} ],
+            						:include => [ :assigned_to, :author, :status, :tracker, :priority, {:custom_values => :custom_field} ],
             						:conditions => @query.statement,
             						:limit => Setting.issues_export_limit
                                    l(:field_tracker),
                                    l(:field_priority),
                                    l(:field_subject),
+                                   l(:field_assigned_to),
                                    l(:field_author),
                                    l(:field_start_date),
                                    l(:field_due_date),
                                         issue.tracker.name,
                                         issue.priority.name,
                                         issue.subject,
-                                        issue.author.display_name,
+                                        (issue.assigned_to ? issue.assigned_to.name : ""),
+                                        issue.author.name,
                                         issue.start_date ? l_date(issue.start_date) : nil,
                                         issue.due_date ? l_date(issue.due_date) : nil,
                                         issue.done_ratio,

app/views/projects/list_issues.rhtml +2 -2

             		<%= sort_header_tag("#{IssueStatus.table_name}.name", :caption => l(:field_status)) %>
             		<%= sort_header_tag("#{Issue.table_name}.priority_id", :caption => l(:field_priority)) %>
             		<th><%=l(:field_subject)%></th>
-            		<%= sort_header_tag("#{User.table_name}.lastname", :caption => l(:field_author)) %>
+            		<%= sort_header_tag("#{User.table_name}.lastname", :caption => l(:field_assigned_to)) %>
             		<%= sort_header_tag("#{Issue.table_name}.updated_on", :caption => l(:field_updated_on)) %>
             	</tr></thead>
             	<tbody>
             		<td><div class="square" style="background:#<%= issue.status.html_color %>;"></div> <%= issue.status.name %></td>
             		<td align="center"><%= issue.priority.name %></td>
             		<td><%= link_to h(issue.subject), :controller => 'issues', :action => 'show', :id => issue %></td>
-            		<td align="center"><%= issue.author.display_name %></td>
+            		<td align="center"><%= issue.assigned_to.name if issue.assigned_to %></td>
             		<td align="center"><%= format_time(issue.updated_on) %></td>
             	</tr>
             	<% 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