[Commits] r2607 - sandbox/borealis/geoext.ux/ux/AttributeFilterPanel/lib/GeoExt.ux/widgets/attributefilterpanel

[commits at geoext.org]

Author: edube
Date: 2011-02-21 06:07:14 +0100 (Mon, 21 Feb 2011)
New Revision: 2607

Modified:
   sandbox/borealis/geoext.ux/ux/AttributeFilterPanel/lib/GeoExt.ux/widgets/attributefilterpanel/FilterAction.js
   sandbox/borealis/geoext.ux/ux/AttributeFilterPanel/lib/GeoExt.ux/widgets/attributefilterpanel/FormToFilter.js
   sandbox/borealis/geoext.ux/ux/AttributeFilterPanel/lib/GeoExt.ux/widgets/attributefilterpanel/ResetAction.js
Log:
borealis sandbox: attributefilterpanel


Modified: sandbox/borealis/geoext.ux/ux/AttributeFilterPanel/lib/GeoExt.ux/widgets/attributefilterpanel/FilterAction.js
===================================================================
--- sandbox/borealis/geoext.ux/ux/AttributeFilterPanel/lib/GeoExt.ux/widgets/attributefilterpanel/FilterAction.js	2011-02-14 08:56:38 UTC (rev 2606)
+++ sandbox/borealis/geoext.ux/ux/AttributeFilterPanel/lib/GeoExt.ux/widgets/attributefilterpanel/FilterAction.js	2011-02-21 05:07:14 UTC (rev 2607)
@@ -38,14 +38,23 @@
 	run: function() {
 		var o = this.options;
 		var f = this.formToFilter.toFilter(this.form, o.logicalOp, o.wildcard);
-		if(o.clientValidation === false || this.form.isValid()){
+		
+		if (o.clientValidation === false || this.form.isValid()) {
 
 			if (o.layer) {
-				o.layer.filter = f;
-				o.layer.refresh({force: true});
+				if (f != null) {
+					o.layer.filter = f;
+					//o.layer.refresh({force: true});
+					if (this.strategy) {
+						this.strategy.load();
+					}
+				} else if (this.noFeaturesOnEmptyForm) {
+					o.layer.removeAllFeatures();
+					o.layer.redraw();
+				}
 			}
 
-		} else if(o.clientValidation !== false){
+		} else if (o.clientValidation !== false){
 			// client validation failed
 			this.failureType = Ext.form.Action.CLIENT_INVALID;
 			this.form.afterAction(this, false);

Modified: sandbox/borealis/geoext.ux/ux/AttributeFilterPanel/lib/GeoExt.ux/widgets/attributefilterpanel/FormToFilter.js
===================================================================
--- sandbox/borealis/geoext.ux/ux/AttributeFilterPanel/lib/GeoExt.ux/widgets/attributefilterpanel/FormToFilter.js	2011-02-14 08:56:38 UTC (rev 2606)
+++ sandbox/borealis/geoext.ux/ux/AttributeFilterPanel/lib/GeoExt.ux/widgets/attributefilterpanel/FormToFilter.js	2011-02-21 05:07:14 UTC (rev 2607)
@@ -88,7 +88,10 @@
 		}
 	});
 	
-
+	if (filters.length == 0) {
+		return null;
+	}
+	
 	return filters.length == 1 && logicalOp != OpenLayers.Filter.Logical.NOT ?
 		filters[0] :
 		new OpenLayers.Filter.Logical({

Modified: sandbox/borealis/geoext.ux/ux/AttributeFilterPanel/lib/GeoExt.ux/widgets/attributefilterpanel/ResetAction.js
===================================================================
--- sandbox/borealis/geoext.ux/ux/AttributeFilterPanel/lib/GeoExt.ux/widgets/attributefilterpanel/ResetAction.js	2011-02-14 08:56:38 UTC (rev 2606)
+++ sandbox/borealis/geoext.ux/ux/AttributeFilterPanel/lib/GeoExt.ux/widgets/attributefilterpanel/ResetAction.js	2011-02-21 05:07:14 UTC (rev 2607)
@@ -45,7 +45,12 @@
 		if (o.layer) {
 			// clear the layer's filter and refresh the layer
 			o.layer.filter = null;
-			o.layer.refresh({force: true});
+			// o.layer.refresh({force: true});
+			// reexecute the filter action instead...
+			var action = new GeoExt.ux.form.FilterAction(this.form, o);
+			GeoExt.form.BasicForm.superclass.doAction.call(
+				this.form, action, o
+			);
 		}
 
 	}