Revision 1298:4f746d8966dd app/views/queries

View differences:

app/views/queries/_columns.html.erb
4 4
      <%= label_tag "available_columns", l(:description_available_columns) %>
5 5
      <br />
6 6
      <%= select_tag 'available_columns',
7
              options_for_select((query.available_inline_columns - query.columns).collect {|column| [column.caption, column.name]}),
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>
......
17 17
    <td>
18 18
      <%= label_tag "selected_columns", l(:description_selected_columns) %>
19 19
      <br />
20
      <%= select_tag((defined?(tag_name) ? tag_name : 'c[]'),
21
              options_for_select(query.inline_columns.collect {|column| [column.caption, column.name]}),
20
      <%= select_tag tag_name,
21
              options_for_select(query_selected_inline_columns_options(query)),
22 22
              :id => 'selected_columns', :multiple => true, :size => 10, :style => "width:150px",
23
              :ondblclick => "moveOptions(this.form.selected_columns, this.form.available_columns);") %>
23
              :ondblclick => "moveOptions(this.form.selected_columns, this.form.available_columns);" %>
24 24
    </td>
25 25
    <td class="buttons">
26 26
      <input type="button" value="&#8593;" onclick="moveOptionUp(this.form.selected_columns);" /><br />
app/views/queries/_form.html.erb
49 49

  
50 50
<%= content_tag 'fieldset', :id => 'columns', :style => (query.has_default_columns? ? 'display:none;' : nil) do %>
51 51
<legend><%= l(:field_column_names) %></legend>
52
<%= render :partial => 'queries/columns', :locals => {:query => query}%>
52
<%= render_query_columns_selection(query) %>
53 53
<% end %>
54 54

  
55 55
</div>

Also available in: Unified diff