@@ -87,22 +87,23 Event.observe(document,"dom:loaded", apply_filters_observer); | |||||
87 | <label for="cb_<%= field %>"><%= filter[1][:name] || l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) %></label> |
|
87 | <label for="cb_<%= field %>"><%= filter[1][:name] || l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) %></label> | |
88 | </td> |
|
88 | </td> | |
89 | <td style="width:150px;"> |
|
89 | <td style="width:150px;"> | |
90 |
<%= select_tag "op[#{field}]", options_for_select(operators_for_select(options[:type]), query.operator_for(field)), :id => "operators_#{field}", :onchange => "toggle_operator('#{field}');", |
|
90 | <%= select_tag "op[#{field}]", options_for_select(operators_for_select(options[:type]), query.operator_for(field)), :id => "operators_#{field}", :onchange => "toggle_operator('#{field}');", :style => "vertical-align: top;" %> | |
91 | </td> |
|
91 | </td> | |
92 | <td> |
|
92 | <td> | |
93 | <div id="div_values_<%= field %>" style="display:none;"> |
|
93 | <div id="div_values_<%= field %>" style="display:none;"> | |
94 | <% case options[:type] |
|
94 | <% case options[:type] | |
95 | when :list, :list_optional, :list_status, :list_subprojects %> |
|
95 | when :list, :list_optional, :list_status, :list_subprojects %> | |
96 |
<select <%= "multiple=true" if query.values_for(field) and query.values_for(field).length > 1 %> name="v[<%= field %>][]" id="values_<%= field %>" |
|
96 | <select <%= "multiple=true" if query.values_for(field) and query.values_for(field).length > 1 %> name="v[<%= field %>][]" id="values_<%= field %>" style="vertical-align: top;"> | |
97 | <%= options_for_select options[:values], query.values_for(field) %> |
|
97 | <%= options_for_select options[:values], query.values_for(field) %> | |
98 | </select> |
|
98 | </select> | |
99 | <%= link_to_function image_tag('bullet_toggle_plus.png'), "toggle_multi_select('#{field}');", :style => "vertical-align: bottom;" %> |
|
99 | <%= link_to_function image_tag('bullet_toggle_plus.png'), "toggle_multi_select('#{field}');", :style => "vertical-align: bottom;" %> | |
100 | <% when :date, :date_past %> |
|
100 | <% when :date, :date_past %> | |
101 |
<%= text_field_tag "v[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 3 |
|
101 | <%= text_field_tag "v[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 3 %> <%= l(:label_day_plural) %> | |
102 | <% when :string, :text %> |
|
102 | <% when :string, :text %> | |
103 |
<%= text_field_tag "v[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 30 |
|
103 | <%= text_field_tag "v[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 30 %> | |
104 | <% when :integer %> |
|
104 | <% when :integer %> | |
105 |
<%= text_field_tag "v[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 3 |
|
105 | <%= text_field_tag "v[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 3 %> | |
|
106 | <%= text_field_tag "v[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 3 %> | |||
106 | <% end %> |
|
107 | <% end %> | |
107 | </div> |
|
108 | </div> | |
108 | <script type="text/javascript">toggle_filter('<%= field %>');</script> |
|
109 | <script type="text/javascript">toggle_filter('<%= field %>');</script> | |
@@ -115,7 +116,6 Event.observe(document,"dom:loaded", apply_filters_observer); | |||||
115 | <%= label_tag('add_filter_select', l(:label_filter_add)) %> |
|
116 | <%= label_tag('add_filter_select', l(:label_filter_add)) %> | |
116 | <%= select_tag 'add_filter_select', options_for_select([["",""]] + query.available_filters.sort{|a,b| a[1][:order]<=>b[1][:order]}.collect{|field| [ field[1][:name] || l(("field_"+field[0].to_s.gsub(/_id$/, "")).to_sym), field[0]] unless query.has_filter?(field[0])}.compact), |
|
117 | <%= select_tag 'add_filter_select', options_for_select([["",""]] + query.available_filters.sort{|a,b| a[1][:order]<=>b[1][:order]}.collect{|field| [ field[1][:name] || l(("field_"+field[0].to_s.gsub(/_id$/, "")).to_sym), field[0]] unless query.has_filter?(field[0])}.compact), | |
117 | :onchange => "add_filter();", |
|
118 | :onchange => "add_filter();", | |
118 | :class => "select-small", |
|
|||
119 | :name => nil %> |
|
119 | :name => nil %> | |
120 | </td> |
|
120 | </td> | |
121 | </tr> |
|
121 | </tr> |
General Comments 0
You need to be logged in to leave comments.
Login now