diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-10-01 10:44:45 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-10-01 10:44:45 +0000 |
| commit | 96b4ac12cbc9a89a6e29d50764ed668102c3c93a (patch) | |
| tree | 9e2fff63ce11ee5f678a35e3f20d99dac05deb3e /app/views/queries | |
| parent | e5f5671d66295100d719d4712a03015268d65e02 (diff) | |
| download | redmine-96b4ac12cbc9a89a6e29d50764ed668102c3c93a.tar.gz redmine-96b4ac12cbc9a89a6e29d50764ed668102c3c93a.zip | |
Added a checkbox on custom query form to explicitly say if the query uses default columns or not.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@783 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/queries')
| -rw-r--r-- | app/views/queries/_columns.rhtml | 7 | ||||
| -rw-r--r-- | app/views/queries/_form.rhtml | 10 |
2 files changed, 11 insertions, 6 deletions
diff --git a/app/views/queries/_columns.rhtml b/app/views/queries/_columns.rhtml new file mode 100644 index 000000000..f233f8ef6 --- /dev/null +++ b/app/views/queries/_columns.rhtml @@ -0,0 +1,7 @@ +<% content_tag 'fieldset', :id => 'columns', :style => (query.has_default_columns? ? 'display:none;' : nil) do %> +<legend><%= l(:field_column_names) %></legend> +<% query.available_columns.each do |column| %> +<label><%= check_box_tag 'query[column_names][]', column.name, query.has_column?(column) %> <%= l("field_#{column.name}") %></label><br /> +<% end %> +<%= hidden_field_tag 'query[column_names][]', '' %> +<% end %> diff --git a/app/views/queries/_form.rhtml b/app/views/queries/_form.rhtml index b4a4987cd..a6b5a496c 100644 --- a/app/views/queries/_form.rhtml +++ b/app/views/queries/_form.rhtml @@ -10,13 +10,11 @@ <%= check_box 'query', 'is_public' %></p> <% end %> -<p><label for="query_column_names"><%=l(:field_column_names)%></label> -<% @query.available_columns.each do |column| %> -<%= check_box_tag 'query[column_names][]', column.name, @query.has_column?(column) %> <%= l("field_#{column.name}") %><br /> -<% end %> -<%= hidden_field_tag 'query[column_names][]', '' %> -</p> +<p><label for="query_default_columns"><%=l(:label_default_columns)%></label> +<%= check_box_tag 'default_columns', 1, @query.has_default_columns?, :id => 'query_default_columns', + :onchange => 'if (this.checked) {Element.hide("columns")} else {Element.show("columns")}' %></p> </div> +<%= render :partial => 'queries/columns', :locals => {:query => query}%> <%= render :partial => 'queries/filters', :locals => {:query => query}%> </div> |