Issue list improvements for subtasking (#5196):

* makes the parent task column available
* display the issue hierarchy when list is sorted by parent

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3618 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/helpers/issues_helper.rb

@@ -18,6 +18,17 @@
 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)
@@ -43,17 +54,14 @@ module IssuesHelper
   
   def render_descendants_tree(issue)
     s = '<form><table class="list issues">'
-    ancestors = []
-    issue.descendants.sort_by(&:lft).each do |child|
-      level = child.level - issue.level - 1
+    issue_list(issue.descendants.sort_by(&:lft)) do |child, level|
       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',
-                                                                      :style => "padding-left: #{level * 20}px") +
+             content_tag('td', link_to_issue(child, :truncate => 60), :class => 'subject') +
              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

@@ -57,6 +57,8 @@ module QueriesHelper
       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

@@ -81,7 +81,7 @@ module SortHelper
     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
@@ -120,6 +120,15 @@ module SortHelper
       @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