Merge branch 'wrdp' into 'develop'

Wrdp

See merge request o2oa/o2oa!2582

o2web/source/x_component_process_Xform/DatagridMobile.js

@@ -838,10 +838,10 @@ MWF.xApplication.process.Xform.DatagridMobile = new Class(
                     //data.site = module.json.site;
                     if (!griddata[id]) griddata[id] = {};
                     griddata[id][module.json.id] = data;
-                }else if( ["Orgfield","Personfield","Org","Address"].contains(module.json.type) ){
-                    data = module.getTextData();
-                    if (!griddata[id]) griddata[id] = {};
-                    griddata[id][module.json.id] = data.value;
+                // }else if( ["Orgfield","Personfield","Org","Address"].contains(module.json.type) ){
+                //     data = module.getTextData();
+                //     if (!griddata[id]) griddata[id] = {};
+                //     griddata[id][module.json.id] = data.value;
                 }else{
                     data = module.getTextData();
                     //if (data.value[0]) flag = false;

o2web/source/x_component_process_Xform/DatagridPC.js

@@ -565,11 +565,11 @@ MWF.xApplication.process.Xform.DatagridPC = new Class(
 					//data.site = module.json.site;
 					if (!griddata[id]) griddata[id] = {};
 					griddata[id][module.json.id] = data;
-				}else if( ["Orgfield","Personfield","Org","Address"].contains(module.json.type) ){
-					data = module.getTextData();
-					if( data.value && data.value.length )flag = false;
-					if (!griddata[id]) griddata[id] = {};
-					griddata[id][module.json.id] = data.value;
+				// }else if( ["Orgfield","Personfield","Org","Address"].contains(module.json.type) ){
+				// 	data = module.getTextData();
+				// 	if( data.value && data.value.length )flag = false;
+				// 	if (!griddata[id]) griddata[id] = {};
+				// 	griddata[id][module.json.id] = data.value;
 				}else{
 					var data = module.getTextData();
 					if (data.value[0]) flag = false;