Merge pull request #10 from gajduk/master

Added option to select nanoflow
remcos · Jan 2, 2019 · 6e9bc77 · 6e9bc77
2 parents 21b48ae + fa09407
commit 6e9bc77
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 7 deletions.
diff --git a/ShowByCondition/src/ShowByCondition/ShowByCondition.xml b/ShowByCondition/src/ShowByCondition/ShowByCondition.xml
diff --git a/ShowByCondition/src/ShowByCondition/widget/ShowByCondition.js b/ShowByCondition/src/ShowByCondition/widget/ShowByCondition.js
@@ -31,6 +31,7 @@ define([
 
         // Parameters configured in the Modeler.
 		microflowName: "",
+		nanoflowName: "",
 		returnValue: "",
 		elementClassFalse: "",
 		elementClassTrue: "",
@@ -102,10 +103,26 @@ define([
 							this.setParentDisplay(result);
 						}),
 						error: function(error) {
-							alert(error.description);
+							console.error(error.description);
 						}
 					}, this);
 				}
+				else if (this.nanoflowName != '') {
+					mx.data.callNanoflow({
+						nanoflow: this.nanoflowName,
+						origin: this.mxform,
+    					context: this.mxcontext,
+						callback: dojo.hitch(this, function (result) {
+							this.setParentDisplay(result);
+						}),
+						error: function(error) {
+							console.error(error.description);
+						}
+					}, this);
+				}
+				else {
+					console.error("Neither a nanoflow or a microflow was specified for show by condition widget.");
+				}
 			}
 
         },
@@ -114,9 +131,9 @@ define([
             var _objectHandle = null;
             // Release handles on previous object, if any.
             if (this._handles) {
-                this._handles.forEach(function (handle, i) {
-                    mx.data.unsubscribe(handle);
-                });
+                this._handles.forEach(lang.hitch(this, function (handle, i) {
+	                this.unsubscribe(handle);
+                }));
                 this._handles = [];
             }
             // When a mendix object exists create subscribtions. 

diff --git a/ShowByCondition/src/package.xml b/ShowByCondition/src/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-    <clientModule name="ShowByCondition" version="1.3.0" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="ShowByCondition" version="1.4.0" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="ShowByCondition/ShowByCondition.xml" />
         </widgetFiles>

diff --git a/ShowByCondition/test/ShowByCondition_TestProject_Mx7_17.mpk b/ShowByCondition/test/ShowByCondition_TestProject_Mx7_17.mpk
diff --git a/ShowByCondition/test/Widget/ShowByCondition.mpk b/ShowByCondition/test/Widget/ShowByCondition.mpk