diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-12-06 17:48:19 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-12-06 17:48:19 +0000 |
| commit | 8201761e7732faa3933899653de5951dcbd6b27c (patch) | |
| tree | d13d476efca02a4b4bf45a3b06b08ccda1aa6e97 /app/views/issues | |
| parent | 43fb3211951ce170df5c7dd1b3f5da871470bdfc (diff) | |
| download | redmine-8201761e7732faa3933899653de5951dcbd6b27c.tar.gz redmine-8201761e7732faa3933899653de5951dcbd6b27c.zip | |
Adds an option for displaying the issue description on the issue list (#3447).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10948 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/issues')
| -rw-r--r-- | app/views/issues/_list.html.erb | 13 | ||||
| -rw-r--r-- | app/views/issues/index.html.erb | 6 |
2 files changed, 15 insertions, 4 deletions
diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb index 0eda312ed..f3e8cae2c 100644 --- a/app/views/issues/_list.html.erb +++ b/app/views/issues/_list.html.erb @@ -10,7 +10,7 @@ :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %> </th> <%= sort_header_tag('id', :caption => '#', :default_order => 'desc') %> - <% query.columns.each do |column| %> + <% query.inline_columns.each do |column| %> <%= column_header(column) %> <% end %> </tr> @@ -21,7 +21,7 @@ <% if @query.grouped? && (group = @query.group_by_column.value(issue)) != previous_group %> <% reset_cycle %> <tr class="group open"> - <td colspan="<%= query.columns.size + 2 %>"> + <td colspan="<%= query.inline_columns.size + 2 %>"> <span class="expander" onclick="toggleRowGroup(this);"> </span> <%= group.blank? ? l(:label_none) : column_content(@query.group_by_column, issue) %> <span class="count"><%= @issue_count_by_group[group] %></span> <%= link_to_function("#{l(:button_collapse_all)}/#{l(:button_expand_all)}", @@ -33,8 +33,15 @@ <tr id="issue-<%= issue.id %>" class="hascontextmenu <%= cycle('odd', 'even') %> <%= issue.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>"> <td class="checkbox hide-when-print"><%= check_box_tag("ids[]", issue.id, false, :id => nil) %></td> <td class="id"><%= link_to issue.id, issue_path(issue) %></td> - <%= raw query.columns.map {|column| "<td class=\"#{column.css_classes}\">#{column_content(column, issue)}</td>"}.join %> + <%= raw query.inline_columns.map {|column| "<td class=\"#{column.css_classes}\">#{column_content(column, issue)}</td>"}.join %> </tr> + <% @query.block_columns.each do |column| + if (text = column_content(column, issue)) && text.present? -%> + <tr class="<%= current_cycle %>"> + <td colspan="<%= @query.inline_columns.size + 2 %>" class="<%= column.css_classes %>"><%= text %></td> + </tr> + <% end -%> + <% end -%> <% end -%> </tbody> </table> diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index d7679d65a..864c7d554 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -34,6 +34,10 @@ @query.group_by) ) %></td> </tr> + <tr> + <td><%= l(:button_show) %></td> + <td><%= available_block_columns_tags(@query) %></td> + </tr> </table> </div> </fieldset> @@ -73,7 +77,7 @@ <label><%= radio_button_tag 'columns', 'all' %> <%= l(:description_all_columns) %></label> </p> <p> - <label><%= check_box_tag 'description', '1' %> <%= l(:field_description) %></label> + <label><%= check_box_tag 'description', '1', @query.has_column?(:description) %> <%= l(:field_description) %></label> </p> <p class="buttons"> <%= submit_tag l(:button_export), :name => nil, :onclick => "hideModal(this);" %> |