jro_apps/redmine Commit - r3504:4524bc04e962

Issue list improvements for subtasking (#5196):...

Jean-Philippe Lang -

r3504:4524bc04e962

parent child

Context file:

r3504:4524bc04e962

Collapse all files

app/helpers/issues_helper.rb +14 -6

             module IssuesHelper
               include ApplicationHelper
+              def issue_list(issues, &block)
+                ancestors = []
+                issues.each do |issue|
+                  while (ancestors.any? && !issue.is_descendant_of?(ancestors.last))
+                    ancestors.pop
+                  end
+                  yield issue, ancestors.size
+                  ancestors << issue
+                end
+              end
               def render_issue_tooltip(issue)
                 @cached_label_start_date ||= l(:field_start_date)
                 @cached_label_due_date ||= l(:field_due_date)
               def render_descendants_tree(issue)
                 s = '<form><table class="list issues">'
-                ancestors = []
+                issue_list(issue.descendants.sort_by(&:lft)) do |child, level|
-                issue.descendants.sort_by(&:lft).each do |child|
-                  level = child.level - issue.level - 1
                   s << content_tag('tr',
                          content_tag('td', check_box_tag("ids[]", child.id, false, :id => nil), :class => 'checkbox') +
-                         content_tag('td', link_to_issue(child, :truncate => 60), :class => 'subject',
+                         content_tag('td', link_to_issue(child, :truncate => 60), :class => 'subject') +
-                                                                                  :style => "padding-left: #{level * 20}px") +
                          content_tag('td', h(child.status)) +
                          content_tag('td', link_to_user(child.assigned_to)) +
                          content_tag('td', progress_bar(child.done_ratio, :width => '80px')),
-                         :class => "issue-#{child.id} hascontextmenu")
+                         :class => "issue issue-#{child.id} hascontextmenu #{level > 0 ? "idnt idnt-#{level}" : nil}")
                 end
                 s << '</form></table>'
                 s

app/helpers/queries_helper.rb +2 0

                   l(:general_text_Yes)
                 when 'FalseClass'
                   l(:general_text_No)
+                when 'Issue'
+                  link_to_issue(value, :subject => false)
                 else
                   h(value)
                 end

app/helpers/sort_helper.rb +10 -1

                 def to_sql
                   sql = @criteria.collect do |k,o|
                     if s = @available_criteria[k]
-                      (o ? s.to_a : s.to_a.collect {|c| "#{c} DESC"}).join(', ')
+                      (o ? s.to_a : s.to_a.collect {|c| append_desc(c)}).join(', ')
                     end
                   end.compact.join(', ')
                   sql.blank? ? nil : sql
                   @criteria.slice!(3)
                   self
                 end
+                # Appends DESC to the sort criterion unless it has a fixed order
+                def append_desc(criterion)
+                  if criterion =~ / (asc|desc)$/i
+                    criterion
+                  else
+                    "#{criterion} DESC"
+                  end
+                end
               end
               def sort_name

app/models/query.rb +3 -1

                   self.groupable = name.to_s
                 end
                 self.default_order = options[:default_order]
+                @caption_key = options[:caption] || "field_#{name}"
               end
               def caption
-                l("field_#{name}")
+                l(@caption_key)
               end
               # Returns true if the column is sortable, otherwise false
               @@available_columns = [
                 QueryColumn.new(:project, :sortable => "#{Project.table_name}.name", :groupable => true),
                 QueryColumn.new(:tracker, :sortable => "#{Tracker.table_name}.position", :groupable => true),
+                QueryColumn.new(:parent, :sortable => ["#{Issue.table_name}.root_id", "#{Issue.table_name}.lft ASC"], :default_order => 'desc', :caption => :field_parent_issue),
                 QueryColumn.new(:status, :sortable => "#{IssueStatus.table_name}.position", :groupable => true),
                 QueryColumn.new(:priority, :sortable => "#{IssuePriority.table_name}.position", :default_order => 'desc', :groupable => true),
                 QueryColumn.new(:subject, :sortable => "#{Issue.table_name}.subject"),

app/views/issues/_list.rhtml +2 -2

             	</tr></thead>
             	<% previous_group = false %>
             	<tbody>
-            	<% issues.each do |issue| -%>
+            	<% issue_list(issues) do |issue, level| -%>
               <% if @query.grouped? && (group = @query.group_by_column.value(issue)) != previous_group %>
                 <% reset_cycle %>
                 <tr class="group open">
             		</tr>
             		<% previous_group = group %>
               <% end %>
-            	<tr id="issue-<%= issue.id %>" class="hascontextmenu <%= cycle('odd', 'even') %> <%= issue.css_classes %>">
+            	<tr id="issue-<%= issue.id %>" class="hascontextmenu <%= cycle('odd', 'even') %> <%= issue.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
             	    <td class="checkbox"><%= check_box_tag("ids[]", issue.id, false, :id => nil) %></td>
             		<td><%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %></td>
                     <% query.columns.each do |column| %><%= content_tag 'td', column_content(column, issue), :class => column.name %><% end %>

public/stylesheets/application.css +11 0

@@ -118,6 +118,17 tr.issue td.subject, tr.issue td.category, td.assigned_to { white-space: normal;
118	tr.issue td.subject { text-align: left; }	118	tr.issue td.subject { text-align: left; }
119	tr.issue td.done_ratio table.progress { margin-left:auto; margin-right: auto;}	119	tr.issue td.done_ratio table.progress { margin-left:auto; margin-right: auto;}
120		120
		121	tr.issue.idnt td.subject a {background: url(../images/bullet_arrow_right.png) no-repeat 0 50%; padding-left: 16px;}
		122	tr.issue.idnt-1 td.subject {padding-left: 0.5em;}
		123	tr.issue.idnt-2 td.subject {padding-left: 2em;}
		124	tr.issue.idnt-3 td.subject {padding-left: 3.5em;}
		125	tr.issue.idnt-4 td.subject {padding-left: 5em;}
		126	tr.issue.idnt-5 td.subject {padding-left: 6.5em;}
		127	tr.issue.idnt-6 td.subject {padding-left: 8em;}
		128	tr.issue.idnt-7 td.subject {padding-left: 9.5em;}
		129	tr.issue.idnt-8 td.subject {padding-left: 11em;}
		130	tr.issue.idnt-9 td.subject {padding-left: 12.5em;}
		131
121	tr.entry { border: 1px solid #f8f8f8; }	132	tr.entry { border: 1px solid #f8f8f8; }
122	tr.entry td { white-space: nowrap; }	133	tr.entry td { white-space: nowrap; }
123	tr.entry td.filename { width: 30%; }	134	tr.entry td.filename { width: 30%; }

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