Merge remote-tracking branch 'origin/develop' into develop

o2web/source/x_component_process_Xform/$Input.js

@@ -439,7 +439,11 @@ MWF.xApplication.process.Xform.$Input = MWF.APP$Input =  new Class({
 
             if (!this.json.validation) return true;
             if (!this.json.validation.code) return true;
+
+            this.currentRouteName = routeName;
             var flag = this.form.Macro.exec(this.json.validation.code, this);
+            this.currentRouteName = "";
+
             if (!flag) flag = MWF.xApplication.process.Xform.LP.notValidation;
             if (flag.toString()!="true"){
                 this.notValidationMode(flag);

o2web/source/x_component_process_Xform/Attachment.js

@@ -1705,7 +1705,11 @@ MWF.xApplication.process.Xform.Attachment = MWF.APPAttachment = new Class({
 
         if (!this.json.validation) return true;
         if (!this.json.validation.code) return true;
+
+        this.currentRouteName = routeName;
         var flag = this.form.Macro.exec(this.json.validation.code, this);
+        this.currentRouteName = "";
+
         if (!flag) flag = MWF.xApplication.process.Xform.LP.notValidation;
         if (flag.toString() != "true") {
             this.notValidationMode(flag);

o2web/source/x_component_process_Xform/DatagridMobile.js

@@ -1397,7 +1397,11 @@ MWF.xApplication.process.Xform.DatagridMobile = new Class({
 
         if (!this.json.validation) return true;
         if (!this.json.validation.code) return true;
+
+        this.currentRouteName = routeName;
         var flag = this.form.Macro.exec(this.json.validation.code, this);
+        this.currentRouteName = "";
+
         if (!flag) flag = MWF.xApplication.process.Xform.LP.notValidation;
         if (flag.toString()!="true"){
             this.notValidationMode(flag);

o2web/source/x_component_process_Xform/DatagridPC.js

@@ -1182,7 +1182,11 @@ MWF.xApplication.process.Xform.DatagridPC = new Class({
 
 		if (!this.json.validation) return true;
 		if (!this.json.validation.code) return true;
+
+		this.currentRouteName = routeName;
 		var flag = this.form.Macro.exec(this.json.validation.code, this);
+		this.currentRouteName = "";
+
 		if (!flag) flag = MWF.xApplication.process.Xform.LP.notValidation;
 		if (flag.toString()!="true"){
 			this.notValidationMode(flag);

o2web/source/x_component_process_Xform/Documenteditor.js

@@ -2815,7 +2815,11 @@ debugger;
 
         if (!this.json.validation) return true;
         if (!this.json.validation.code) return true;
+
+        this.currentRouteName = routeName;
         var flag = this.form.Macro.exec(this.json.validation.code, this);
+        this.currentRouteName = "";
+
         if (!flag) flag = MWF.xApplication.process.Xform.LP.notValidation;
         if (flag.toString()!="true"){
             this.notValidationMode(flag);

o2web/source/x_component_process_Xform/Htmleditor.js

@@ -518,7 +518,11 @@ MWF.xApplication.process.Xform.Htmleditor = MWF.APPHtmleditor =  new Class({
 
         if (!this.json.validation) return true;
         if (!this.json.validation.code) return true;
+
+        this.currentRouteName = routeName;
         var flag = this.form.Macro.exec(this.json.validation.code, this);
+        this.currentRouteName = "";
+
         if (!flag) flag = MWF.xApplication.process.Xform.LP.notValidation;
         if (flag.toString()!="true"){
             this.notValidationMode(flag);

o2web/source/x_component_process_Xform/ImageClipper.js

@@ -284,7 +284,9 @@ MWF.xApplication.process.Xform.ImageClipper = MWF.APPImageClipper =  new Class({
 
         if (!this.json.validation) return true;
         if (!this.json.validation.code) return true;
+        this.currentRouteName = routeName;
         var flag = this.form.Macro.exec(this.json.validation.code, this);
+        this.currentRouteName = "";
         if (!flag) flag = MWF.xApplication.process.Xform.LP.notValidation;
         if (flag.toString()!="true"){
             this.notValidationMode(flag);

o2web/source/x_component_process_Xform/Number.js

@@ -127,7 +127,9 @@ MWF.xApplication.process.Xform.Number = MWF.APPNumber =  new Class({
 
             if (!this.json.validation) return true;
             if (!this.json.validation.code) return true;
+            this.currentRouteName = routeName;
             var flag = this.form.Macro.exec(this.json.validation.code, this);
+            this.currentRouteName = "";
             if (!flag) flag = MWF.xApplication.process.Xform.LP.notValidation;
             if (flag.toString() != "true") {
                 this.notValidationMode(flag);