Permalink
Browse files

Merge pull request #747 from jbescoyez/fix-timestamp-presence-filter

Filtering timestamps fields by blank or present generates a query error
  • Loading branch information...
2 parents 6810a1e + 100a29e commit dc8cbf07ff97282d370eb6dca823e59ec710df8c @bbenezech bbenezech committed Sep 28, 2011
Showing with 2 additions and 2 deletions.
  1. +2 −2 app/assets/javascripts/rails_admin/ra.filter-box.js
@@ -29,8 +29,8 @@
'<option data-additional-fieldset="true" ' + (field_operator == "less_than" ? 'selected="selected"' : '') + ' value="less_than">Less than ... days ago</option>' +
'<option data-additional-fieldset="true" ' + (field_operator == "more_than" ? 'selected="selected"' : '') + ' value="more_than">More than ... days ago</option>' +
'<option disabled="disabled">---------</option>' +
- '<option data-additional-fieldset="false"' + (field_operator == "_present" ? 'selected="selected"' : '') + ' value="_present">Is present</option>' +
- '<option data-additional-fieldset="false"' + (field_operator == "_blank" ? 'selected="selected"' : '') + ' value="_blank" >Is blank</option>' +
+ '<option data-additional-fieldset="false"' + (field_operator == "_not_null" ? 'selected="selected"' : '') + ' value="_not_null">Is not null</option>' +
+ '<option data-additional-fieldset="false"' + (field_operator == "_null" ? 'selected="selected"' : '') + ' value="_null" >Is null</option>' +
'</select>' +
'<input class="additional-fieldset text_field" style="display:' + (field_operator == "less_than" || field_operator == "more_than" ? 'block' : 'none') + ';" type="text" name="' + value_name + '" value="' + field_value + '" /> ';
break;

0 comments on commit dc8cbf0

Please sign in to comment.