Merge lp:~openerp/openobject-client-web/trunk-bug-filters-niv into lp:openobject-client-web/trunk

[Nicolas Vanhoren (OpenERP)]

Fixed incorrect merge. Restored a previous patch that fixed problems with booleans (+ some other types) in custom filters.

[lp:~openerp/openobject-client-web/trunk-bug-filters-niv]

4608. By Nicolas Vanhoren (OpenERP) on 2011-03-09

Fixed incorrect merge in 4445 that overrided some files. Restored previous fix with custom filters.

------------- This line and the following will be ignored --------------

modified:
  addons/openerp/controllers/search.py
  addons/openerp/static/javascript/search.js
unknown:
  openerp/
  tmp.diff
  addons/web_livechat/
  addons/openerp/static/javascript/search..bak.js

[Xavier (Open ERP) (xmo-deactivatedaccount)]

* Don't revert the parsing to simplejson, the data received is not necessarily in JS, because they can come from e.g. switch_SearchView which throws raw Python datastructures in there so filters are breaking when e.g. switching to Form view then back to List
* The else branch within the ilike/not ilike case is not correct, '%' is added by the server and adding it in JS breaks the custom filters when switching back from other views (or saving)
* Is it really necessary to revert the whole revision instead of just the fields handling? Do you know why they were originally removed?

review: Needs Fixing

Unmerged revisions

4608. By Nicolas Vanhoren (OpenERP) on 2011-03-09

Fixed incorrect merge in 4445 that overrided some files. Restored previous fix with custom filters.

------------- This line and the following will be ignored --------------

modified:
  addons/openerp/controllers/search.py
  addons/openerp/static/javascript/search.js
unknown:
  openerp/
  tmp.diff
  addons/web_livechat/
  addons/openerp/static/javascript/search..bak.js

=== modified file 'addons/openerp/controllers/search.py'
--- addons/openerp/controllers/search.py	2011-03-04 07:12:57 +0000
+++ addons/openerp/controllers/search.py	2011-03-09 14:34:04 +0000
@@ -25,6 +25,7 @@
 from error_page import _ep
 from openobject import rpc
 from openobject.tools import expose, ast
+import simplejson
 
 class Search(Form):
 
@@ -342,7 +343,7 @@
         if not custom_domains:
             custom_domains = []
         else:
-            custom_domains = ast.literal_eval(custom_domains)
+            custom_domains = simplejson.loads(custom_domains)
         
         # conversion of the pseudo domain from the javascript to a valid domain
         ncustom_domain = []

=== modified file 'addons/openerp/static/javascript/search.js'
--- addons/openerp/static/javascript/search.js	2011-03-02 09:50:09 +0000
+++ addons/openerp/static/javascript/search.js	2011-03-09 14:34:04 +0000
@@ -297,121 +297,161 @@
         }
     });
 	
-	if (!error) {
-		openobject.http.postJSON('/openerp/search/get', {
-			record: serializeJSON(Allrecords),
-			_terp_model: jQuery(idSelector('_terp_model')).val()
-		}).addCallback(function(obj){
-			var custom_domain = [];
-			if (obj.errors.length) {
-				for (er_field in obj.errors) {
-					for (er in obj.errors[er_field]) {
-						jQuery('tbody .filter_row_class', idSelector('filter_option_table')).each(function(){
-							if (jQuery(idSelector('filterlabel'), this).attr('value') == er) {
-								jQuery('input.qstring', this).addClass('errorfield').val(obj.errors[er_field][er]).click(function(){
-									jQuery(this).val('').removeClass('errorfield');
-								});
-							}
-						})
-					}
-				}
-				return;
-			}
-			var form_result = obj.frm;
-			var tbody_keys = jQuery.keys(form_result);
-			
-			if (form_result) {
-				// By property, we get incorrect ordering
-				for (var ind = 0; ind < tbody_keys.length; ind++) {
-					var All_domain = [];
-					var group = [];
-					var tbody_frm_ind = form_result[tbody_keys[ind]]; //tbody dictionary
-					var trs_keys = jQuery.unique(jQuery.keys(tbody_frm_ind)); //sort trs
-					for (var index = 0; index < trs_keys.length; index++) {
-						var return_record = tbody_frm_ind[trs_keys[index]];
-						var $curr_body = jQuery('tbody', idSelector('filter_option_table')).eq(tbody_keys[ind]);
-						var $row = jQuery('.filter_row_class', $curr_body).eq(trs_keys[index]);
-						var $next_row = [];
-						if ($row.next('tr.filter_row_class').find('input.qstring').val() != '') {
-							$next_row = jQuery($row.next());
-						}
-						
-						var type = return_record.type;
-						var temp_domain = [];
-						var grouping = $next_row.length != 0 ? jQuery('label.and_or', $next_row).text() : null;
-						
-						if (group.length == 0) {
-							var $new_grp = $curr_body.find('tr.filter_row_class:gt(' + trs_keys[index] + ')').find('td#filter_column:not(:has(label)) input.qstring[value]');
-							if ($new_grp.length) {
-								group.push('&')
-							}
-						}
-						if (grouping) {
-							temp_domain.push(grouping == 'AND' ? '&' : '|');
-						}
-						
-						var field = return_record['rec'];
-						var comparison = jQuery('select.expr', $row).val();
-						var value = return_record['rec_val'];
-						
-						switch (comparison) {
-							case 'ilike':
-							case 'not ilike':
-								if (isOrderable(type)) {
-									comparison = (comparison == 'ilike' ? '=' : '!=');
-								}
-								break;
-							case '<':
-							case '>':
-								if (!isOrderable(type)) {
-									comparison = '=';
-								}
-								break;
-							case 'in':
-							case 'not in':
-								if (typeof value == 'string') {
-									value = value.split(',');
-								}
-								else 
-									if (type == 'many2many') {
-										/* very weird array-type construct
-							 looks a bit like [[6, 0, [list of ids here]]]
-							 */
-										value = value[value.length - 1][value[value.length - 1].length - 1]
-									}
-									else 
-										if (type == 'one2many') {
-											value = value[0];
-										}
-										else {
-											value = value;
-										}
-								break;
-						}
-						
-						if (jQuery('label.and_or', $row).length > 0 || grouping) {
-							temp_domain.push(field, comparison, value);
-							group.push(temp_domain);
-						}
-						else {
-							group.push(field, comparison, value)
-						}
-						
-						if (!grouping) {
-							All_domain.push(group);
-							group = [];
-						}
-					}
-					
-					if (All_domain.length) {
-						custom_domain.push(All_domain);
-					}
-				}
-			}
-			
-			final_search_domain(serializeJSON(custom_domain), all_domains, group_by_ctx);
-		});
-	}
+    openobject.http.postJSON('/openerp/search/get', {
+        record: serializeJSON(Allrecords),
+        _terp_model: jQuery('#_terp_model').val()
+    }).addCallback(function(obj) {
+        var custom_domain = [];
+        if(obj.error) {
+            jQuery('#filter_option_table tbody > .filter_row_class').each(function () {
+                if(jQuery(this).find('#filterlabel').attr('value') == obj['error_field']) {
+                    jQuery(this).find('input.qstring').css('background', '#f66').val(obj.error);
+                }
+                else {
+                    error_display(obj.error)
+                }
+            });
+        }
+        var form_result = obj.frm;
+        var tbody_keys = jQuery.keys(form_result);
+
+        if(form_result) {
+            // By property, we get incorrect ordering
+            for(var ind=0; ind<tbody_keys.length ;ind++){
+                var All_domain = [];
+                var group = [];
+                var tbody_frm_ind = form_result[tbody_keys[ind]]; //tbody dictionary
+                var trs_keys = jQuery.unique(jQuery.keys(tbody_frm_ind)); //sort trs
+
+                for(var index = 0; index<trs_keys.length ; index++) {
+                    var return_record = tbody_frm_ind[trs_keys[index]];
+                    var $curr_body = jQuery('#filter_option_table > tbody').eq(tbody_keys[ind]);
+                    var $row = $curr_body.find('> .filter_row_class').eq(trs_keys[index]);
+                    var $next_row = [];
+
+                    if ($row.next('tr.filter_row_class').find('input.qstring').val() != ''){
+                        $next_row = jQuery($row.next());
+                    }
+
+                    var type = return_record.type;
+                    var temp_domain = [];
+                    var grouping = $next_row.length != 0 ? $next_row.find('label.and_or').text(): null;
+
+                    if (group.length==0) {
+                        var $new_grp = $curr_body.find('tr.filter_row_class:gt('+trs_keys[index]+')')
+                                                 .find('td#filter_column:not(:has(label)) input.qstring[value]');
+                        if ($new_grp.length){
+                            group.push('&')
+                        }
+                    }
+                    if(grouping) {
+                        temp_domain.push(grouping == 'AND' ? '&' : '|');
+                    }
+
+                    var field = return_record['rec'];
+                    var comparison = $row.find('select.expr').val();
+                    var value = return_record['rec_val'];
+                    
+                    // if there is multiple values we must split them before conversion
+                    isMultipleValues = comparison == 'in' || comparison == 'not in';
+                    var values;
+                    if(isMultipleValues) {
+                    	values = value.split(',');
+                    } else {
+                    	values = [value];
+                    }
+                    // converting values
+                    var newValues = [];
+                    jQuery.each(values, function(i,valuePart) {
+                    	var tmp;
+                    	switch (type) {
+                    	case "string":
+                    	case "many2one":
+                    	case "many2many":
+                    	case "one2many":
+                    	case "date":
+                    	case "reference":
+                    	case "char":
+                    	case "text":
+                    	case "datetime":
+                    	case "time":
+                    	case "binary":
+                    	case "selection":
+                    	case "one2one":
+                    		break;
+                    	case "boolean":
+                    		valuePart = valuePart.toLowerCase().trim();
+                    		if(valuePart == "true" || valuePart == "yes" || valuePart == "1") {
+                    			valuePart = true;
+                    		} else if (valuePart == "false" || valuePart == "no" || valuePart == "0") {
+                    			valuePart = false;
+                    		} else {
+                    			valuePart = Boolean(valuePart);
+                    		}
+                    		break;
+                    	case "integer":
+                    	case "integer_big":
+                    		tmp = parseInt(valuePart,10);
+                    		if(! isNaN(tmp)) {
+                    			valuePart = tmp;
+                    		}
+                    		break;
+                    	case "float":
+                    		tmp = parseFloat(valuePart);
+                    		if(! isNaN(tmp)) {
+                    			valuePart = tmp;
+                    		}
+                    		break;
+                    	default:
+                    		//console.warning("unhandled type: " + type);
+                    	}
+                    	newValues.push(valuePart);
+                    });
+                    if(isMultipleValues) {
+                    	value = newValues;
+                    } else {
+                    	value = newValues[0];
+                    }
+                    
+                    switch (comparison) {
+                    case 'ilike':
+                    case 'not ilike':
+                        if(isOrderable(type)) {
+                            comparison = (comparison == 'ilike' ? '=' : '!=');
+                        }
+                        else{
+                        	value = '%' + value + '%';
+                        }
+                        break;
+                    case '<':
+                    case '>':
+                        if(!isOrderable(type)) {
+                            comparison = '=';
+                        }
+                        break;
+                    }
+
+                    if ($row.find('label.and_or').length>0 || grouping){
+                        temp_domain.push(field, comparison, value);
+                        group.push(temp_domain);
+                    }
+                    else{
+                        group.push(field, comparison, value)
+                    }
+
+                    if (!grouping) {
+                        All_domain.push(group);
+                        group = [];
+                    }
+                }
+
+                if (All_domain.length) {
+                   custom_domain.push(All_domain);
+                }
+            }
+        }
+        final_search_domain(serializeJSON(custom_domain), all_domains, group_by_ctx);
+    });
 }
 
 var group_by = [];