kolan/Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adds helpers for query columns selection.

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11451 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2013-02-23 12:04:29 +00:00
parent 998928ecdf
commit 1ac8fd8c42
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/settings_controller.rb
View File

@ -19,6 +19,8 @@ class SettingsController < ApplicationController
layout 'admin' layout 'admin'
menu_item :plugins, :only => :plugin menu_item :plugins, :only => :plugin
helper :queries
before_filter :require_admin before_filter :require_admin
def index def index

8
app/helpers/queries_helper.rb
View File

@ -37,6 +37,14 @@ module QueriesHelper
tags tags
end 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) def column_header(column)
column.sortable ? sort_header_tag(column.name.to_s, :caption => column.caption, column.sortable ? sort_header_tag(column.name.to_s, :caption => column.caption,
:default_order => column.default_order) : :default_order => column.default_order) :

4
app/views/queries/_columns.html.erb
View File

@ -4,7 +4,7 @@
<%= label_tag "available_columns", l(:description_available_columns) %> <%= label_tag "available_columns", l(:description_available_columns) %>
<br /> <br />
<%= select_tag 'available_columns', <%= 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", :multiple => true, :size => 10, :style => "width:150px",
:ondblclick => "moveOptions(this.form.available_columns, this.form.selected_columns);" %> :ondblclick => "moveOptions(this.form.available_columns, this.form.selected_columns);" %>
</td> </td>
@ -18,7 +18,7 @@
<%= label_tag "selected_columns", l(:description_selected_columns) %> <%= label_tag "selected_columns", l(:description_selected_columns) %>
<br /> <br />
<%= select_tag((defined?(tag_name) ? tag_name : 'c[]'), <%= 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", :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>