jro_apps/redmine Commit - r772:96b4ac12cbc9

0

app/views/queries/_columns.rhtml created 644 +7 0

@@ -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 %>

0

app/controllers/queries_controller.rb +2 0

                 @query.user = logged_in_user
                 @query.executed_by = logged_in_user
                 @query.is_public = false unless current_role.allowed_to?(:manage_public_queries)
+                @query.column_names = nil if params[:default_columns]
                 params[:fields].each do |field|
                   @query.add_filter(field, params[:operators][field], params[:values][field])
                   end if params[:fields]
                   @query.attributes = params[:query]
                   @query.is_public = false unless current_role.allowed_to?(:manage_public_queries)
+                  @query.column_names = nil if params[:default_columns]
                   if @query.save
                     flash[:notice] = l(:notice_successful_update)

0

app/models/query.rb +7 -4

               end
               def columns
-                if column_names && !column_names.empty?
+                if has_default_columns?
-                  available_columns.select {|c| column_names.include?(c.name) }
-                else
-                  # default columns
                   available_columns.select {|c| c.default? }
+                else
+                  available_columns.select {|c| column_names.include?(c.name) }
                 end
               end
                 column_names && column_names.include?(column.name)
               end
+              def has_default_columns?
+                column_names.nil? || column_names.empty?
+              end
               def statement
                 # project/subprojects clause
                 clause = ''

0

app/views/queries/_form.rhtml +4 -6

               <%= check_box 'query', 'is_public' %></p>
             <% end %>
-            <p><label for="query_column_names"><%=l(:field_column_names)%></label>
+            <p><label for="query_default_columns"><%=l(:label_default_columns)%></label>
-            <% @query.available_columns.each do |column| %>
+            <%= check_box_tag 'default_columns', 1, @query.has_default_columns?, :id => 'query_default_columns',
-            <%= check_box_tag  'query[column_names][]', column.name, @query.has_column?(column) %> <%= l("field_#{column.name}") %><br />
+                  :onchange => 'if (this.checked) {Element.hide("columns")} else {Element.show("columns")}' %></p>
-            <% end %>
-            <%= hidden_field_tag 'query[column_names][]', '' %>
-            </p>
             </div>
+            <%= render :partial => 'queries/columns', :locals => {:query => query}%>
             <%= render :partial => 'queries/filters', :locals => {:query => query}%>
             </div>

0

lang/bg.yml +1 0

             label_file_plural: Files
             label_changeset_plural: Changesets
             field_column_names: Columns
+            label_default_columns: Default columns

0

lang/cs.yml +1 0

             field_estimated_hours: Estimated time
             label_changeset_plural: Changesets
             field_column_names: Columns
+            label_default_columns: Default columns

0

lang/de.yml +1 0

             label_file_plural: Files
             label_changeset_plural: Changesets
             field_column_names: Columns
+            label_default_columns: Default columns

0

lang/en.yml +1 0

             label_jump_to_a_project: Jump to a project...
             label_file_plural: Files
             label_changeset_plural: Changesets
+            label_default_columns: Default columns
             button_login: Login
             button_submit: Submit

0

lang/es.yml +1 0

             label_file_plural: Files
             label_changeset_plural: Changesets
             field_column_names: Columns
+            label_default_columns: Default columns

0

lang/fr.yml +1 0

             label_jump_to_a_project: Aller à un projet...
             label_file_plural: Fichiers
             label_changeset_plural: Révisions
+            label_default_columns: Colonnes par défaut
             button_login: Connexion
             button_submit: Soumettre

0

lang/it.yml +1 0

             label_file_plural: Files
             label_changeset_plural: Changesets
             field_column_names: Columns
+            label_default_columns: Default columns

0

lang/ja.yml +1 0

             label_file_plural: Files
             label_changeset_plural: Changesets
             field_column_names: Columns
+            label_default_columns: Default columns

0

lang/nl.yml +1 0

             label_file_plural: Files
             label_changeset_plural: Changesets
             field_column_names: Columns
+            label_default_columns: Default columns

0

lang/pl.yml +1 0

             label_file_plural: Pliki
             label_changeset_plural: Zestawienia zmian
             field_column_names: Columns
+            label_default_columns: Default columns

0

lang/pt-br.yml +1 0

             label_file_plural: Files
             label_changeset_plural: Changesets
             field_column_names: Columns
+            label_default_columns: Default columns

0

lang/pt.yml +1 0

             label_file_plural: Files
             label_changeset_plural: Changesets
             field_column_names: Columns
+            label_default_columns: Default columns

0

lang/ro.yml +1 0

             label_file_plural: Files
             label_changeset_plural: Changesets
             field_column_names: Columns
+            label_default_columns: Default columns

0

lang/sv.yml +1 0

             label_file_plural: Files
             label_changeset_plural: Changesets
             field_column_names: Columns
+            label_default_columns: Default columns

0

lang/zh.yml +1 0

             label_file_plural: Files
             label_changeset_plural: Changesets
             field_column_names: Columns
+            label_default_columns: Default columns

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages