jro_apps/redmine Commit - r11222:d255e98023e5

Adds an helper for rendering query columns selection....

Jean-Philippe Lang -

r11222:d255e98023e5

parent child

Context file:

r11222:d255e98023e5

app/helpers/queries_helper.rb +5 0

                 (query.inline_columns & query.available_inline_columns).reject(&:frozen?).collect {|column| [column.caption, column.name]}
               end
+              def render_query_columns_selection(query, options={})
+                tag_name = (options[:name] || 'c') + '[]'
+                render :partial => 'queries/columns', :locals => {:query => query, :tag_name => tag_name}
+              end
               def column_header(column)
                 column.sortable ? sort_header_tag(column.name.to_s, :caption => column.caption,
                                                                     :default_order => column.default_order) :

app/views/issues/index.html.erb +1 -1

                     <table>
                       <tr>
                         <td><%= l(:field_column_names) %></td>
-                        <td><%= render :partial => 'queries/columns', :locals => {:query => @query} %></td>
+                        <td><%= render_query_columns_selection(@query) %></td>
                       </tr>
                       <tr>
                         <td><label for='group_by'><%= l(:field_group_by) %></label></td>

app/views/queries/_columns.html.erb +2 -2

                 <td>
                   <%= label_tag "selected_columns", l(:description_selected_columns) %>
                   <br />
-                  <%= select_tag((defined?(tag_name) ? tag_name : 'c[]'),
+                  <%= select_tag tag_name,
                           options_for_select(query_selected_inline_columns_options(query)),
                           :id => 'selected_columns', :multiple => true, :size => 10, :style => "width:150px",
-                          :ondblclick => "moveOptions(this.form.selected_columns, this.form.available_columns);") %>
+                          :ondblclick => "moveOptions(this.form.selected_columns, this.form.available_columns);" %>
                 </td>
                 <td class="buttons">
                   <input type="button" value="&#8593;" onclick="moveOptionUp(this.form.selected_columns);" /><br />

app/views/queries/_form.html.erb +1 -1

             <%= content_tag 'fieldset', :id => 'columns', :style => (query.has_default_columns? ? 'display:none;' : nil) do %>
             <legend><%= l(:field_column_names) %></legend>
-            <%= render :partial => 'queries/columns', :locals => {:query => query}%>
+            <%= render render_query_columns_selection(query) %>
             <% end %>
             </div>

app/views/settings/_issues.html.erb +3 -5

             <fieldset class="box">
             	<legend><%= l(:setting_issue_list_default_columns) %></legend>
-              <%= render :partial => 'queries/columns',
+              <%= render_query_columns_selection(
-                         :locals => {
+                    IssueQuery.new(:column_names => Setting.issue_list_default_columns),
-                           :query => IssueQuery.new(:column_names => Setting.issue_list_default_columns),
+                    :name => 'settings[issue_list_default_columns]') %>
-                           :tag_name => 'settings[issue_list_default_columns][]'
-                         } %>
             </fieldset>
             <%= submit_tag l(:button_save) %>

app/views/timelog/_date_range.html.erb +1 -1

                   <table>
                     <tr>
                       <td><%= l(:field_column_names) %></td>
-                      <td><%= render :partial => 'queries/columns', :locals => {:query => @query} %></td>
+                      <td><%= render_query_columns_selection(@query) %></td>
                     </tr>
                   </table>
                 </div>

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	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