Custom query columns: checkboxes replaced by two selects that let the user specify columns order.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@784 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/views/queries/_columns.rhtml

@@ -1,7 +1,27 @@
 <% content_tag 'fieldset', :id => 'columns', :style => (query.has_default_columns? ? 'display:none;' : nil) do %>
 <legend><%= l(:field_column_names) %></legend>
-<% query.available_columns.each do |column| %>
-<label><%= check_box_tag  'query[column_names][]', column.name, query.has_column?(column) %> <%= l("field_#{column.name}") %></label><br />
-<% end %>
+
 <%= hidden_field_tag 'query[column_names][]', '' %>
+<table margin=0>
+	<tr>
+		<td><%= select_tag 'available_columns',
+		          options_for_select((query.available_columns - query.columns).collect {|column| [l("field_#{column.name}"), column.name]}),
+		          :multiple => true, :size => 10, :style => "width:150px" %>
+		</td>
+		<td align="center" valign="middle">
+			<input type="button" value="--&gt;"
+			 onclick="moveOptions(this.form.available_columns, this.form.selected_columns);" /><br />
+			<input type="button" value="&lt;--"
+			 onclick="moveOptions(this.form.selected_columns, this.form.available_columns);" />
+		</td>
+		<td><%= select_tag 'query[column_names][]',
+		          options_for_select(@query.columns.collect {|column| [l("field_#{column.name}"), column.name]}),
+		          :id => 'selected_columns', :multiple => true, :size => 10, :style => "width:150px" %>
+		</td>
+	</tr>
+</table>
+<% end %>
+
+<% content_for :header_tags do %>
+<%= javascript_include_tag 'select_list_move' %>
 <% end %>

app/views/queries/_form.rhtml

@@ -12,9 +12,9 @@
 
 <p><label for="query_default_columns"><%=l(:label_default_columns)%></label>
 <%= check_box_tag 'default_columns', 1, @query.has_default_columns?, :id => 'query_default_columns',
-      :onchange => 'if (this.checked) {Element.hide("columns")} else {Element.show("columns")}' %></p>
+      :onclick => 'if (this.checked) {Element.hide("columns")} else {Element.show("columns")}' %></p>
 </div>
 
-<%= render :partial => 'queries/columns', :locals => {:query => query}%>
 <%= render :partial => 'queries/filters', :locals => {:query => query}%>
+<%= render :partial => 'queries/columns', :locals => {:query => query}%>
 </div>

app/views/queries/edit.rhtml

@@ -1,6 +1,6 @@
 <h2><%= l(:label_query) %></h2>
 
-<% form_tag({:action => 'edit', :id => @query}) do %>
+<% form_tag({:action => 'edit', :id => @query}, :onsubmit => 'selectAllOptions("selected_columns");') do %>
   <%= render :partial => 'form', :locals => {:query => @query} %>
   <%= submit_tag l(:button_save) %>
 <% end %>

app/views/queries/new.rhtml

@@ -1,6 +1,6 @@
 <h2><%= l(:label_query_new) %></h2>
 
-<% form_tag({:action => 'new', :project_id => @query.project}) do %>
+<% form_tag({:action => 'new', :project_id => @query.project}, :onsubmit => 'selectAllOptions("selected_columns");') do %>
   <%= render :partial => 'form', :locals => {:query => @query} %>
   <%= submit_tag l(:button_save) %>
 <% end %>