Revision 442:753f1380d6bc app/views/queries/.svn

View differences:

app/views/queries/.svn/all-wcprops
1
K 25
2
svn:wc:ra_dav:version-url
3
V 56
4
/svn/!svn/ver/5878/branches/1.2-stable/app/views/queries
5
END
app/views/queries/.svn/entries
1 1
10
2 2

  
3 3
dir
4
4993
5
http://redmine.rubyforge.org/svn/trunk/app/views/queries
4
6000
5
http://redmine.rubyforge.org/svn/branches/1.2-stable/app/views/queries
6 6
http://redmine.rubyforge.org/svn
7 7

  
8 8

  
9 9

  
10
2010-11-07T15:38:51.908839Z
11
4387
10
2011-04-03T14:31:32.940784Z
11
5304
12 12
jplang
13 13

  
14 14

  
......
32 32

  
33 33

  
34 34

  
35
2011-03-03T11:05:11.000000Z
36
409f5db0d48427b0a9077eb0804d13f9
37
2009-11-28T11:59:45.246623Z
38
3106
35
2011-06-06T13:18:33.000000Z
36
b7275c2d279af7900a9b83a4a7e93611
37
2011-04-03T14:31:32.940784Z
38
5304
39 39
jplang
40 40
has-props
41 41

  
......
58 58

  
59 59

  
60 60

  
61
1235
61
1217
62 62

63 63
_form.rhtml
64 64
file
......
66 66

  
67 67

  
68 68

  
69
2011-03-03T11:05:11.000000Z
69
2011-06-06T13:14:59.000000Z
70 70
9d6312b02ab4243f7f899de6e37e260b
71 71
2009-11-28T11:34:12.256986Z
72 72
3105
......
100 100

  
101 101

  
102 102

  
103
2011-03-03T11:05:11.000000Z
103
2011-06-06T13:14:59.000000Z
104 104
b2d901380f08af968240e5dc82b90fc4
105 105
2007-10-01T11:39:34.113865Z
106 106
784
......
134 134

  
135 135

  
136 136

  
137
2011-03-03T11:05:11.000000Z
138
e57491c4634e00f0ef53c44959c58d46
139
2010-11-07T15:38:51.908839Z
140
4387
137
2011-06-06T13:18:33.000000Z
138
9b66a1f09df990f9bbc5bb79427d7a7b
139
2011-04-01T15:00:23.035426Z
140
5279
141 141
jplang
142 142
has-props
143 143

  
......
160 160

  
161 161

  
162 162

  
163
4495
163
4537
164 164

165 165
index.rhtml
166 166
file
......
168 168

  
169 169

  
170 170

  
171
2011-03-03T11:05:11.000000Z
171
2011-06-06T13:14:59.000000Z
172 172
214378e8574ddebfc274513b423f51a2
173 173
2007-11-05T18:38:42.932265Z
174 174
887
......
202 202

  
203 203

  
204 204

  
205
2011-03-03T11:05:11.000000Z
205
2011-06-06T13:14:59.000000Z
206 206
d42e88aaf70a65db3b609d51857fb711
207 207
2009-09-20T14:06:57.257282Z
208 208
2895
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