| @@ -19,6 +19,8 class SettingsController < ApplicationController | |||
|
|
19 | 19 | layout 'admin' |
|
|
20 | 20 | menu_item :plugins, :only => :plugin |
|
|
21 | 21 | |
|
|
22 | helper :queries | |
|
|
23 | ||
|
|
22 | 24 | before_filter :require_admin |
|
|
23 | 25 | |
|
|
24 | 26 | def index |
| @@ -37,6 +37,14 module QueriesHelper | |||
|
|
37 | 37 | tags |
|
|
38 | 38 | end |
|
|
39 | 39 | |
|
|
40 | def query_available_inline_columns_options(query) | |
|
|
41 | (query.available_inline_columns - query.columns).reject(&:frozen?).collect {|column| [column.caption, column.name]} | |
|
|
42 | end | |
|
|
43 | ||
|
|
44 | def query_selected_inline_columns_options(query) | |
|
|
45 | (query.inline_columns & query.available_inline_columns).reject(&:frozen?).collect {|column| [column.caption, column.name]} | |
|
|
46 | end | |
|
|
47 | ||
|
|
40 | 48 | def column_header(column) |
|
|
41 | 49 | column.sortable ? sort_header_tag(column.name.to_s, :caption => column.caption, |
|
|
42 | 50 | :default_order => column.default_order) : |
| @@ -4,7 +4,7 | |||
|
|
4 | 4 | <%= label_tag "available_columns", l(:description_available_columns) %> |
|
|
5 | 5 | <br /> |
|
|
6 | 6 | <%= select_tag 'available_columns', |
|
|
7 |
options_for_select( |
|
|
|
7 | options_for_select(query_available_inline_columns_options(query)), | |
|
|
8 | 8 | :multiple => true, :size => 10, :style => "width:150px", |
|
|
9 | 9 | :ondblclick => "moveOptions(this.form.available_columns, this.form.selected_columns);" %> |
|
|
10 | 10 | </td> |
| @@ -18,7 +18,7 | |||
|
|
18 | 18 | <%= label_tag "selected_columns", l(:description_selected_columns) %> |
|
|
19 | 19 | <br /> |
|
|
20 | 20 | <%= select_tag((defined?(tag_name) ? tag_name : 'c[]'), |
|
|
21 | options_for_select((query.inline_columns & query.available_inline_columns).reject(&:frozen?).collect {|column| [column.caption, column.name]}), | |
|
|
21 | options_for_select(query_selected_inline_columns_options(query)), | |
|
|
22 | 22 | :id => 'selected_columns', :multiple => true, :size => 10, :style => "width:150px", |
|
|
23 | 23 | :ondblclick => "moveOptions(this.form.selected_columns, this.form.available_columns);") %> |
|
|
24 | 24 | </td> |
General Comments 0
You need to be logged in to leave comments.
Login now