jro_apps/redmine Commit - r11221:1ac8fd8c4214

Adds helpers for query columns selection....

Jean-Philippe Lang -

r11221:1ac8fd8c4214

parent child

Context file:

r11221:1ac8fd8c4214

app/controllers/settings_controller.rb +2 0

               layout 'admin'
               menu_item :plugins, :only => :plugin
+              helper :queries
               before_filter :require_admin
               def index

app/helpers/queries_helper.rb +8 0

                 tags
               end
+              def query_available_inline_columns_options(query)
+                (query.available_inline_columns - query.columns).reject(&:frozen?).collect {|column| [column.caption, column.name]}
+              end
+              def query_selected_inline_columns_options(query)
+                (query.inline_columns & query.available_inline_columns).reject(&:frozen?).collect {|column| [column.caption, column.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/queries/_columns.html.erb +2 -2

                   <%= label_tag "available_columns", l(:description_available_columns) %>
                   <br />
                   <%= select_tag 'available_columns',
-                          options_for_select((query.available_inline_columns - query.columns).reject(&:frozen?).collect {|column| [column.caption, column.name]}),
+                          options_for_select(query_available_inline_columns_options(query)),
                           :multiple => true, :size => 10, :style => "width:150px",
                           :ondblclick => "moveOptions(this.form.available_columns, this.form.selected_columns);" %>
                 </td>
                   <%= label_tag "selected_columns", l(:description_selected_columns) %>
                   <br />
                   <%= select_tag((defined?(tag_name) ? tag_name : 'c[]'),
-                          options_for_select((query.inline_columns & query.available_inline_columns).reject(&:frozen?).collect {|column| [column.caption, column.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);") %>
                 </td>

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