##// END OF EJS Templates
jro_apps » redmine
RSS
Added a checkbox on custom query form to explicitly say if the query uses default columns or not....
Jean-Philippe Lang -
r772:96b4ac12cbc9
parent child
Show More
Show file before | Show file after | Hide comments
@@ -0,0 +1,7
1 <% content_tag 'fieldset', :id => 'columns', :style => (query.has_default_columns? ? 'display:none;' : nil) do %>
2 <legend><%= l(:field_column_names) %></legend>
3 <% query.available_columns.each do |column| %>
4 <label><%= check_box_tag 'query[column_names][]', column.name, query.has_column?(column) %> <%= l("field_#{column.name}") %></label><br />
5 <% end %>
6 <%= hidden_field_tag 'query[column_names][]', '' %>
7 <% end %>
Show file before | Show file after | Hide comments
@@ -31,6 +31,7 class QueriesController < ApplicationController
31 31 @query.user = logged_in_user
32 32 @query.executed_by = logged_in_user
33 33 @query.is_public = false unless current_role.allowed_to?(:manage_public_queries)
34 @query.column_names = nil if params[:default_columns]
34 35
35 36 params[:fields].each do |field|
36 37 @query.add_filter(field, params[:operators][field], params[:values][field])
@@ -52,7 +53,8 class QueriesController < ApplicationController
52 53 end if params[:fields]
53 54 @query.attributes = params[:query]
54 55 @query.is_public = false unless current_role.allowed_to?(:manage_public_queries)
55
56 @query.column_names = nil if params[:default_columns]
57
56 58 if @query.save
57 59 flash[:notice] = l(:notice_successful_update)
58 60 redirect_to :controller => 'projects', :action => 'list_issues', :id => @project, :query_id => @query
Show file before | Show file after | Hide comments
@@ -208,11 +208,10 class Query < ActiveRecord::Base
208 208 end
209 209
210 210 def columns
211 if column_names && !column_names.empty?
212 available_columns.select {|c| column_names.include?(c.name) }
213 else
214 # default columns
211 if has_default_columns?
215 212 available_columns.select {|c| c.default? }
213 else
214 available_columns.select {|c| column_names.include?(c.name) }
216 215 end
217 216 end
218 217
@@ -225,6 +224,10 class Query < ActiveRecord::Base
225 224 def has_column?(column)
226 225 column_names && column_names.include?(column.name)
227 226 end
227
228 def has_default_columns?
229 column_names.nil? || column_names.empty?
230 end
228 231
229 232 def statement
230 233 # project/subprojects clause
Show file before | Show file after | Hide comments
@@ -10,13 +10,11
10 10 <%= check_box 'query', 'is_public' %></p>
11 11 <% end %>
12 12
13 <p><label for="query_column_names"><%=l(:field_column_names)%></label>
14 <% @query.available_columns.each do |column| %>
15 <%= check_box_tag 'query[column_names][]', column.name, @query.has_column?(column) %> <%= l("field_#{column.name}") %><br />
16 <% end %>
17 <%= hidden_field_tag 'query[column_names][]', '' %>
18 </p>
13 <p><label for="query_default_columns"><%=l(:label_default_columns)%></label>
14 <%= check_box_tag 'default_columns', 1, @query.has_default_columns?, :id => 'query_default_columns',
15 :onchange => 'if (this.checked) {Element.hide("columns")} else {Element.show("columns")}' %></p>
19 16 </div>
20 17
18 <%= render :partial => 'queries/columns', :locals => {:query => query}%>
21 19 <%= render :partial => 'queries/filters', :locals => {:query => query}%>
22 20 </div>
Show file before | Show file after | Hide comments
@@ -512,3 +512,4 enumeration_activities: Дейности (time tracking)
512 512 label_file_plural: Files
513 513 label_changeset_plural: Changesets
514 514 field_column_names: Columns
515 label_default_columns: Default columns
Show file before | Show file after | Hide comments
@@ -512,3 +512,4 label_added_time_by: Added by %s %s ago
512 512 field_estimated_hours: Estimated time
513 513 label_changeset_plural: Changesets
514 514 field_column_names: Columns
515 label_default_columns: Default columns
Show file before | Show file after | Hide comments
@@ -512,3 +512,4 enumeration_activities: Aktivitäten (Zeiterfassung)
512 512 label_file_plural: Files
513 513 label_changeset_plural: Changesets
514 514 field_column_names: Columns
515 label_default_columns: Default columns
Show file before | Show file after | Hide comments
@@ -423,6 +423,7 label_updated_time: Updated %s ago
423 423 label_jump_to_a_project: Jump to a project...
424 424 label_file_plural: Files
425 425 label_changeset_plural: Changesets
426 label_default_columns: Default columns
426 427
427 428 button_login: Login
428 429 button_submit: Submit
Show file before | Show file after | Hide comments
@@ -512,3 +512,4 enumeration_activities: Activities (time tracking)
512 512 label_file_plural: Files
513 513 label_changeset_plural: Changesets
514 514 field_column_names: Columns
515 label_default_columns: Default columns
Show file before | Show file after | Hide comments
@@ -423,6 +423,7 label_updated_time: Mis à jour il y a %s
423 423 label_jump_to_a_project: Aller à un projet...
424 424 label_file_plural: Fichiers
425 425 label_changeset_plural: Révisions
426 label_default_columns: Colonnes par défaut
426 427
427 428 button_login: Connexion
428 429 button_submit: Soumettre
Show file before | Show file after | Hide comments
@@ -512,3 +512,4 enumeration_activities: Attività (time tracking)
512 512 label_file_plural: Files
513 513 label_changeset_plural: Changesets
514 514 field_column_names: Columns
515 label_default_columns: Default columns
Show file before | Show file after | Hide comments
@@ -513,3 +513,4 enumeration_activities: 作業分類 (時間トラッキング)
513 513 label_file_plural: Files
514 514 label_changeset_plural: Changesets
515 515 field_column_names: Columns
516 label_default_columns: Default columns
Show file before | Show file after | Hide comments
@@ -513,3 +513,4 text_comma_separated: Multiple values allowed (comma separated).
513 513 label_file_plural: Files
514 514 label_changeset_plural: Changesets
515 515 field_column_names: Columns
516 label_default_columns: Default columns
Show file before | Show file after | Hide comments
@@ -512,3 +512,4 field_estimated_hours: Szacowany czas
512 512 label_file_plural: Pliki
513 513 label_changeset_plural: Zestawienia zmian
514 514 field_column_names: Columns
515 label_default_columns: Default columns
Show file before | Show file after | Hide comments
@@ -512,3 +512,4 enumeration_activities: Atividades (time tracking)
512 512 label_file_plural: Files
513 513 label_changeset_plural: Changesets
514 514 field_column_names: Columns
515 label_default_columns: Default columns
Show file before | Show file after | Hide comments
@@ -512,3 +512,4 enumeration_activities: Atividades (time tracking)
512 512 label_file_plural: Files
513 513 label_changeset_plural: Changesets
514 514 field_column_names: Columns
515 label_default_columns: Default columns
Show file before | Show file after | Hide comments
@@ -512,3 +512,4 label_index_by_title: Index by title
512 512 label_file_plural: Files
513 513 label_changeset_plural: Changesets
514 514 field_column_names: Columns
515 label_default_columns: Default columns
Show file before | Show file after | Hide comments
@@ -513,3 +513,4 field_comments: Comment
513 513 label_file_plural: Files
514 514 label_changeset_plural: Changesets
515 515 field_column_names: Columns
516 label_default_columns: Default columns
Show file before | Show file after | Hide comments
@@ -515,3 +515,4 label_wiki_page: Wiki page
515 515 label_file_plural: Files
516 516 label_changeset_plural: Changesets
517 517 field_column_names: Columns
518 label_default_columns: Default columns
General Comments 0
You need to be logged in to leave comments. Login now