##// END OF EJS Templates
Sort criteria defined in custom queries are not applied when exporting to CSV (#22354)....
Jean-Philippe Lang -
r14916:8e2482d2c195
parent child
Show More
@@ -1,121 +1,121
1 <div class="contextual">
1 <div class="contextual">
2 <% if !@query.new_record? && @query.editable_by?(User.current) %>
2 <% if !@query.new_record? && @query.editable_by?(User.current) %>
3 <%= link_to l(:button_edit), edit_query_path(@query), :class => 'icon icon-edit' %>
3 <%= link_to l(:button_edit), edit_query_path(@query), :class => 'icon icon-edit' %>
4 <%= delete_link query_path(@query) %>
4 <%= delete_link query_path(@query) %>
5 <% end %>
5 <% end %>
6 </div>
6 </div>
7
7
8 <h2><%= @query.new_record? ? l(:label_issue_plural) : @query.name %></h2>
8 <h2><%= @query.new_record? ? l(:label_issue_plural) : @query.name %></h2>
9 <% html_title(@query.new_record? ? l(:label_issue_plural) : @query.name) %>
9 <% html_title(@query.new_record? ? l(:label_issue_plural) : @query.name) %>
10
10
11 <%= form_tag({ :controller => 'issues', :action => 'index', :project_id => @project },
11 <%= form_tag({ :controller => 'issues', :action => 'index', :project_id => @project },
12 :method => :get, :id => 'query_form') do %>
12 :method => :get, :id => 'query_form') do %>
13 <div id="query_form_with_buttons" class="hide-when-print">
13 <div id="query_form_with_buttons" class="hide-when-print">
14 <%= hidden_field_tag 'set_filter', '1' %>
14 <%= hidden_field_tag 'set_filter', '1' %>
15 <div id="query_form_content">
15 <div id="query_form_content">
16 <fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
16 <fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
17 <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
17 <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
18 <div style="<%= @query.new_record? ? "" : "display: none;" %>">
18 <div style="<%= @query.new_record? ? "" : "display: none;" %>">
19 <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
19 <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
20 </div>
20 </div>
21 </fieldset>
21 </fieldset>
22 <fieldset id="options" class="collapsible collapsed">
22 <fieldset id="options" class="collapsible collapsed">
23 <legend onclick="toggleFieldset(this);"><%= l(:label_options) %></legend>
23 <legend onclick="toggleFieldset(this);"><%= l(:label_options) %></legend>
24 <div style="display: none;">
24 <div style="display: none;">
25 <table>
25 <table>
26 <tr>
26 <tr>
27 <td class="field"><%= l(:field_column_names) %></td>
27 <td class="field"><%= l(:field_column_names) %></td>
28 <td><%= render_query_columns_selection(@query) %></td>
28 <td><%= render_query_columns_selection(@query) %></td>
29 </tr>
29 </tr>
30 <tr>
30 <tr>
31 <td class="field"><label for='group_by'><%= l(:field_group_by) %></label></td>
31 <td class="field"><label for='group_by'><%= l(:field_group_by) %></label></td>
32 <td><%= select_tag('group_by',
32 <td><%= select_tag('group_by',
33 options_for_select(
33 options_for_select(
34 [[]] + @query.groupable_columns.collect {|c| [c.caption, c.name.to_s]},
34 [[]] + @query.groupable_columns.collect {|c| [c.caption, c.name.to_s]},
35 @query.group_by)
35 @query.group_by)
36 ) %></td>
36 ) %></td>
37 </tr>
37 </tr>
38 <tr>
38 <tr>
39 <td class="field"><%= l(:button_show) %></td>
39 <td class="field"><%= l(:button_show) %></td>
40 <td><%= available_block_columns_tags(@query) %></td>
40 <td><%= available_block_columns_tags(@query) %></td>
41 </tr>
41 </tr>
42 <tr>
42 <tr>
43 <td><%= l(:label_total_plural) %></td>
43 <td><%= l(:label_total_plural) %></td>
44 <td><%= available_totalable_columns_tags(@query) %></td>
44 <td><%= available_totalable_columns_tags(@query) %></td>
45 </tr>
45 </tr>
46 </table>
46 </table>
47 </div>
47 </div>
48 </fieldset>
48 </fieldset>
49 </div>
49 </div>
50 <p class="buttons">
50 <p class="buttons">
51 <%= link_to_function l(:button_apply), '$("#query_form").submit()', :class => 'icon icon-checked' %>
51 <%= link_to_function l(:button_apply), '$("#query_form").submit()', :class => 'icon icon-checked' %>
52 <%= link_to l(:button_clear), { :set_filter => 1, :project_id => @project }, :class => 'icon icon-reload' %>
52 <%= link_to l(:button_clear), { :set_filter => 1, :project_id => @project }, :class => 'icon icon-reload' %>
53 <% if @query.new_record? && User.current.allowed_to?(:save_queries, @project, :global => true) %>
53 <% if @query.new_record? && User.current.allowed_to?(:save_queries, @project, :global => true) %>
54 <%= link_to_function l(:button_save),
54 <%= link_to_function l(:button_save),
55 "$('#query_form').attr('action', '#{ @project ? new_project_query_path(@project) : new_query_path }').submit()",
55 "$('#query_form').attr('action', '#{ @project ? new_project_query_path(@project) : new_query_path }').submit()",
56 :class => 'icon icon-save' %>
56 :class => 'icon icon-save' %>
57 <% end %>
57 <% end %>
58 </p>
58 </p>
59 </div>
59 </div>
60 <% end %>
60 <% end %>
61
61
62 <%= error_messages_for 'query' %>
62 <%= error_messages_for 'query' %>
63 <% if @query.valid? %>
63 <% if @query.valid? %>
64 <% if @issues.empty? %>
64 <% if @issues.empty? %>
65 <p class="nodata"><%= l(:label_no_data) %></p>
65 <p class="nodata"><%= l(:label_no_data) %></p>
66 <% else %>
66 <% else %>
67 <%= render_query_totals(@query) %>
67 <%= render_query_totals(@query) %>
68 <%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query} %>
68 <%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query} %>
69 <span class="pagination"><%= pagination_links_full @issue_pages, @issue_count %></span>
69 <span class="pagination"><%= pagination_links_full @issue_pages, @issue_count %></span>
70 <% end %>
70 <% end %>
71
71
72 <% other_formats_links do |f| %>
72 <% other_formats_links do |f| %>
73 <%= f.link_to 'Atom', :url => params.merge(:key => User.current.rss_key) %>
73 <%= f.link_to 'Atom', :url => params.merge(:key => User.current.rss_key) %>
74 <%= f.link_to 'CSV', :url => params, :onclick => "showModal('csv-export-options', '350px'); return false;" %>
74 <%= f.link_to 'CSV', :url => params, :onclick => "showModal('csv-export-options', '350px'); return false;" %>
75 <%= f.link_to 'PDF', :url => params %>
75 <%= f.link_to 'PDF', :url => params %>
76 <% end %>
76 <% end %>
77
77
78 <div id="csv-export-options" style="display:none;">
78 <div id="csv-export-options" style="display:none;">
79 <h3 class="title"><%= l(:label_export_options, :export_format => 'CSV') %></h3>
79 <h3 class="title"><%= l(:label_export_options, :export_format => 'CSV') %></h3>
80 <%= form_tag(_project_issues_path(@project, :format => 'csv'), :method => :get, :id => 'csv-export-form') do %>
80 <%= form_tag(_project_issues_path(@project, :format => 'csv'), :method => :get, :id => 'csv-export-form') do %>
81 <%= query_as_hidden_field_tags(@query) %>
81 <%= query_as_hidden_field_tags(@query) %>
82 <%= hidden_field_tag 'sort', params[:sort], :id => nil %>
82 <%= hidden_field_tag 'sort', @sort_criteria.to_param, :id => nil %>
83 <p>
83 <p>
84 <label><%= radio_button_tag 'csv[columns]', '', true %> <%= l(:description_selected_columns) %></label><br />
84 <label><%= radio_button_tag 'csv[columns]', '', true %> <%= l(:description_selected_columns) %></label><br />
85 <label><%= radio_button_tag 'csv[columns]', 'all' %> <%= l(:description_all_columns) %></label>
85 <label><%= radio_button_tag 'csv[columns]', 'all' %> <%= l(:description_all_columns) %></label>
86 </p>
86 </p>
87 <p>
87 <p>
88 <label><%= check_box_tag 'csv[description]', '1', @query.has_column?(:description) %> <%= l(:field_description) %></label>
88 <label><%= check_box_tag 'csv[description]', '1', @query.has_column?(:description) %> <%= l(:field_description) %></label>
89 </p>
89 </p>
90 <% if @issue_count > Setting.issues_export_limit.to_i %>
90 <% if @issue_count > Setting.issues_export_limit.to_i %>
91 <p class="icon icon-warning">
91 <p class="icon icon-warning">
92 <%= l(:setting_issues_export_limit) %>: <%= Setting.issues_export_limit.to_i %>
92 <%= l(:setting_issues_export_limit) %>: <%= Setting.issues_export_limit.to_i %>
93 </p>
93 </p>
94 <% end %>
94 <% end %>
95 <p class="buttons">
95 <p class="buttons">
96 <%= submit_tag l(:button_export), :name => nil, :onclick => "hideModal(this);" %>
96 <%= submit_tag l(:button_export), :name => nil, :onclick => "hideModal(this);" %>
97 <%= submit_tag l(:button_cancel), :name => nil, :onclick => "hideModal(this);", :type => 'button' %>
97 <%= submit_tag l(:button_cancel), :name => nil, :onclick => "hideModal(this);", :type => 'button' %>
98 </p>
98 </p>
99 <% end %>
99 <% end %>
100 </div>
100 </div>
101
101
102 <% end %>
102 <% end %>
103 <%= call_hook(:view_issues_index_bottom, { :issues => @issues, :project => @project, :query => @query }) %>
103 <%= call_hook(:view_issues_index_bottom, { :issues => @issues, :project => @project, :query => @query }) %>
104
104
105 <% content_for :sidebar do %>
105 <% content_for :sidebar do %>
106 <%= render :partial => 'issues/sidebar' %>
106 <%= render :partial => 'issues/sidebar' %>
107 <% end %>
107 <% end %>
108
108
109 <% content_for :header_tags do %>
109 <% content_for :header_tags do %>
110 <%= auto_discovery_link_tag(:atom,
110 <%= auto_discovery_link_tag(:atom,
111 {:query_id => @query, :format => 'atom',
111 {:query_id => @query, :format => 'atom',
112 :page => nil, :key => User.current.rss_key},
112 :page => nil, :key => User.current.rss_key},
113 :title => l(:label_issue_plural)) %>
113 :title => l(:label_issue_plural)) %>
114 <%= auto_discovery_link_tag(:atom,
114 <%= auto_discovery_link_tag(:atom,
115 {:controller => 'journals', :action => 'index',
115 {:controller => 'journals', :action => 'index',
116 :query_id => @query, :format => 'atom',
116 :query_id => @query, :format => 'atom',
117 :page => nil, :key => User.current.rss_key},
117 :page => nil, :key => User.current.rss_key},
118 :title => l(:label_changes_details)) %>
118 :title => l(:label_changes_details)) %>
119 <% end %>
119 <% end %>
120
120
121 <%= context_menu issues_context_menu_path %>
121 <%= context_menu issues_context_menu_path %>
General Comments 0
You need to be logged in to leave comments. Login now