summaryrefslogtreecommitdiffstats
path: root/app/views/queries
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2013-02-23 10:53:21 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2013-02-23 10:53:21 +0000
commit9b1ebd6808d260a95eff38c2a93ec2c1b7ed8183 (patch)
tree63f1b433deebd1590299380157c87dbb54e59c48 /app/views/queries
parentd1244b31a4c2c6f8a5625f92506f7e281fb1cc00 (diff)
downloadredmine-9b1ebd6808d260a95eff38c2a93ec2c1b7ed8183.tar.gz
redmine-9b1ebd6808d260a95eff38c2a93ec2c1b7ed8183.zip
Refactor: makes issue id a regular QueryColumn.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11447 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/queries')
-rw-r--r--app/views/queries/_columns.html.erb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/queries/_columns.html.erb b/app/views/queries/_columns.html.erb
index 78d3c5703..329ffd67c 100644
--- a/app/views/queries/_columns.html.erb
+++ b/app/views/queries/_columns.html.erb
@@ -4,7 +4,7 @@
<%= label_tag "available_columns", l(:description_available_columns) %>
<br />
<%= select_tag 'available_columns',
- options_for_select((query.available_inline_columns - query.columns).collect {|column| [column.caption, column.name]}),
+ options_for_select((query.available_inline_columns - query.columns).reject(&:frozen?).collect {|column| [column.caption, column.name]}),
:multiple => true, :size => 10, :style => "width:150px",
:ondblclick => "moveOptions(this.form.available_columns, this.form.selected_columns);" %>
</td>
@@ -18,7 +18,7 @@
<%= label_tag "selected_columns", l(:description_selected_columns) %>
<br />
<%= select_tag((defined?(tag_name) ? tag_name : 'c[]'),
- options_for_select(query.inline_columns.collect {|column| [column.caption, column.name]}),
+ options_for_select((query.inline_columns & query.available_inline_columns).reject(&:frozen?).collect {|column| [column.caption, column.name]}),
:id => 'selected_columns', :multiple => true, :size => 10, :style => "width:150px",
:ondblclick => "moveOptions(this.form.selected_columns, this.form.available_columns);") %>
</td>