json filters added to post

refer to pull tonytomov#598
kccarter76 · May 13, 2014 · 71e7fff · 71e7fff
1 parent 9f0b324
commit 71e7fff
Showing 1 changed file with 18 additions and 2 deletions.
diff --git a/js/grid.custom.js b/js/grid.custom.js
@@ -237,7 +237,15 @@ $.jgrid.extend({
 						if($t.p.postData.hasOwnProperty(n)) { delete $t.p.postData[n];}
 					});
 				} else {
-					$.extend($t.p.postData,sdata);
+					var filters = '{"fields":[';
+	                    		$.each(sdata,function(i,n){
+	                    			var val = $.isArray(n) ? n.join('|') : n, value = $.trim(val.replace(/\\/g,'\\\\').replace(/\"/g,'\\"'));
+	                    			if (value !== '') {
+		                        		filters += '{"field":"' + i + '", "op": "' + sopt[i] + '", "value":"' + value + '"},';
+	                    			}
+		                    	});
+		                    	filters = (sdata.length > 0 ? filters.slice(0,-1) : filters) + ']}';
+					$.extend($t.p.postData, sdata, { filters: filters } );
 				}
 				var saveurl;
 				if($t.p.searchurl) {
@@ -314,7 +322,15 @@ $.jgrid.extend({
 						if($t.p.postData.hasOwnProperty(n)) { delete $t.p.postData[n];}
 					});
 				} else {
-					$.extend($t.p.postData,sdata);
+					var filters = '{"fields":[';
+                    			$.each(sdata,function(i,n){
+			                        var val = $.isArray(n) ? n.join('|') : n, value = $.trim(val.replace(/\\/g,'\\\\').replace(/\"/g,'\\"'));
+			                        if (value !== '') {
+			                            filters += '{"field":"' + i + '", "op": "' + sopt[i] + '", "value":"' + value + '"},';
+			                        }
+			                    });
+                    			filters = (sdata.length > 0 ? filters.slice(0,-1) : filters) + ']}';
+					$.extend($t.p.postData, sdata, { filters: filters } );
 				}
 				var saveurl;
 				if($t.p.searchurl) {