Revision 442:753f1380d6bc app/views/queries/.svn/text-base

View differences:

app/views/queries/.svn/text-base/_columns.rhtml.svn-base
10 10
			<input type="button" value="&#8592;"
11 11
			 onclick="moveOptions(this.form.selected_columns, this.form.available_columns);" />
12 12
		</td>
13
		<td><%= select_tag 'query[column_names][]',
13
		<td><%= select_tag 'c[]',
14 14
		          options_for_select(query.columns.collect {|column| [column.caption, column.name]}),
15 15
		          :id => 'selected_columns', :multiple => true, :size => 10, :style => "width:150px" %>
16 16
		</td>
app/views/queries/.svn/text-base/_filters.rhtml.svn-base
21 21
    
22 22
    if (check_box.checked) {
23 23
        Element.show("operators_" + field);
24
				Form.Element.enable("operators_" + field);
25
        Form.Element.enable("values_" + field);
24 26
        toggle_operator(field);
25 27
    } else {
26 28
        Element.hide("operators_" + field);
27 29
        Element.hide("div_values_" + field);
30
        Form.Element.disable("operators_" + field);
31
        Form.Element.disable("values_" + field);
28 32
  }
29 33
}
30 34

  
......
54 58
    }
55 59
}
56 60

  
61
function submit_query_form(id) {
62
  selectAllOptions("selected_columns");
63
  $(id).submit();
64
}
65

  
57 66
function apply_filters_observer() {
58 67
  $$("#query_form input[type=text]").invoke("observe", "keypress", function(e){
59 68
    if(e.keyCode == Event.KEY_RETURN) {
60
      <%= remote_function(:url => { :set_filter => 1},
61
                          :update => "content",
62
                          :with => "Form.serialize('query_form')",
63
                          :complete => "e.stop(); apply_filters_observer()") %>
69
      submit_query_form("query_form");
64 70
    }
65 71
  });
66 72
}
......
77 83
       options = filter[1] %>
78 84
    <tr <%= 'style="display:none;"' unless query.has_filter?(field) %> id="tr_<%= field %>" class="filter">
79 85
    <td style="width:200px;">
80
        <%= check_box_tag 'fields[]', field, query.has_filter?(field), :onclick => "toggle_filter('#{field}');", :id => "cb_#{field}" %>
86
        <%= check_box_tag 'f[]', field, query.has_filter?(field), :onclick => "toggle_filter('#{field}');", :id => "cb_#{field}" %>
81 87
        <label for="cb_<%= field %>"><%= filter[1][:name] || l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) %></label>
82 88
    </td>
83 89
    <td style="width:150px;">
84
        <%= select_tag "operators[#{field}]", options_for_select(operators_for_select(options[:type]), query.operator_for(field)), :id => "operators_#{field}", :onchange => "toggle_operator('#{field}');", :class => "select-small", :style => "vertical-align: top;" %>
90
        <%= select_tag "op[#{field}]", options_for_select(operators_for_select(options[:type]), query.operator_for(field)), :id => "operators_#{field}", :onchange => "toggle_operator('#{field}');", :class => "select-small", :style => "vertical-align: top;" %>
85 91
    </td>
86 92
    <td>    
87 93
    <div id="div_values_<%= field %>" style="display:none;">
88 94
    <% case options[:type]
89 95
    when :list, :list_optional, :list_status, :list_subprojects %>
90
        <select <%= "multiple=true" if query.values_for(field) and query.values_for(field).length > 1 %> name="values[<%= field %>][]" id="values_<%= field %>" class="select-small" style="vertical-align: top;">
96
        <select <%= "multiple=true" if query.values_for(field) and query.values_for(field).length > 1 %> name="v[<%= field %>][]" id="values_<%= field %>" class="select-small" style="vertical-align: top;">
91 97
        <%= options_for_select options[:values], query.values_for(field) %>        
92 98
        </select>
93 99
        <%= link_to_function image_tag('bullet_toggle_plus.png'), "toggle_multi_select('#{field}');", :style => "vertical-align: bottom;" %>
94 100
    <% when :date, :date_past %>
95
        <%= text_field_tag "values[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 3, :class => "select-small" %> <%= l(:label_day_plural) %>
101
        <%= text_field_tag "v[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 3, :class => "select-small" %> <%= l(:label_day_plural) %>
96 102
    <% when :string, :text %>
97
        <%= text_field_tag "values[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 30, :class => "select-small" %>
103
        <%= text_field_tag "v[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 30, :class => "select-small" %>
98 104
    <% when :integer %>
99
        <%= text_field_tag "values[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 3, :class => "select-small" %>
105
        <%= text_field_tag "v[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 3, :class => "select-small" %>
100 106
    <% end %>
101 107
    </div>
102 108
    <script type="text/javascript">toggle_filter('<%= field %>');</script>
......
114 120
</td>
115 121
</tr>
116 122
</table>
117
<%= hidden_field_tag 'fields[]', '' %>
123
<%= hidden_field_tag 'f[]', '' %>

Also available in: Unified diff