diff options
Diffstat (limited to 'app/views/queries')
| -rw-r--r-- | app/views/queries/_columns.rhtml | 11 | ||||
| -rw-r--r-- | app/views/queries/_form.rhtml | 4 |
2 files changed, 7 insertions, 8 deletions
diff --git a/app/views/queries/_columns.rhtml b/app/views/queries/_columns.rhtml index 1a481adae..e11b286b6 100644 --- a/app/views/queries/_columns.rhtml +++ b/app/views/queries/_columns.rhtml @@ -1,10 +1,6 @@ -<% content_tag 'fieldset', :id => 'columns', :style => (query.has_default_columns? ? 'display:none;' : nil) do %> -<legend><%= l(:field_column_names) %></legend> - -<%= hidden_field_tag 'query[column_names][]', '', :id => nil %> -<table> +<table style="border-collapse: collapse; border:0;"> <tr> - <td><%= select_tag 'available_columns', + <td style="padding-left:0"><%= select_tag 'available_columns', options_for_select((query.available_columns - query.columns).collect {|column| [column.caption, column.name]}), :multiple => true, :size => 10, :style => "width:150px" %> </td> @@ -15,12 +11,11 @@ onclick="moveOptions(this.form.selected_columns, this.form.available_columns);" /> </td> <td><%= select_tag 'query[column_names][]', - options_for_select(@query.columns.collect {|column| [column.caption, column.name]}), + options_for_select(query.columns.collect {|column| [column.caption, 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' %> diff --git a/app/views/queries/_form.rhtml b/app/views/queries/_form.rhtml index 577699d70..dcafe9f60 100644 --- a/app/views/queries/_form.rhtml +++ b/app/views/queries/_form.rhtml @@ -37,5 +37,9 @@ <% end %> </fieldset> +<% content_tag 'fieldset', :id => 'columns', :style => (query.has_default_columns? ? 'display:none;' : nil) do %> +<legend><%= l(:field_column_names) %></legend> <%= render :partial => 'queries/columns', :locals => {:query => query}%> +<% end %> + </div> |