feat(Reports) fixes #229: Just 2 related modules in report creation

tsolucio · Mar 1, 2015 · 171819d · 171819d
1 parent b288b47
commit 171819d
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 2 deletions.
diff --git a/include/js/de_de.lang.js b/include/js/de_de.lang.js
@@ -376,4 +376,5 @@ var alert_arr = {
 	'LBL_LESS_THAN_HOURS_LATER' : 'less than hours later',
 	'LBL_MORE_THAN_HOURS_BEFORE' : 'more than hours before',
 	'LBL_MORE_THAN_HOURS_LATER' : 'more than hours later',
+	'MAXIMUM_OF_TWO_MODULES_PERMITTED' : 'A maximum of two modules is permitted.'
 };
diff --git a/include/js/en_gb.lang.js b/include/js/en_gb.lang.js
@@ -332,4 +332,5 @@ var alert_arr = {
 	'LBL_LESS_THAN_HOURS_LATER' : 'less than hours later',
 	'LBL_MORE_THAN_HOURS_BEFORE' : 'more than hours before',
 	'LBL_MORE_THAN_HOURS_LATER' : 'more than hours later',
+	'MAXIMUM_OF_TWO_MODULES_PERMITTED' : 'A maximum of two modules is permitted.'
 };
diff --git a/include/js/en_us.lang.js b/include/js/en_us.lang.js
@@ -377,4 +377,5 @@ var alert_arr = {
 	'LBL_LESS_THAN_HOURS_LATER' : 'less than hours later',
 	'LBL_MORE_THAN_HOURS_BEFORE' : 'more than hours before',
 	'LBL_MORE_THAN_HOURS_LATER' : 'more than hours later',
+	'MAXIMUM_OF_TWO_MODULES_PERMITTED' : 'A maximum of two modules is permitted.'
 };
diff --git a/include/js/es_es.lang.js b/include/js/es_es.lang.js
@@ -372,4 +372,5 @@ var alert_arr = {
 	'LBL_LESS_THAN_HOURS_LATER' : 'menos de x horas después',
 	'LBL_MORE_THAN_HOURS_BEFORE' : 'más de x horas antes',
 	'LBL_MORE_THAN_HOURS_LATER' : 'más de x horas después',
+	'MAXIMUM_OF_TWO_MODULES_PERMITTED' : 'Solo se permite relacionar con un máximo de dos módulos.'
 };
diff --git a/include/js/es_mx.lang.js b/include/js/es_mx.lang.js
@@ -372,4 +372,5 @@ var alert_arr = {
 	'LBL_LESS_THAN_HOURS_LATER' : 'menos de x horas después',
 	'LBL_MORE_THAN_HOURS_BEFORE' : 'más de x horas antes',
 	'LBL_MORE_THAN_HOURS_LATER' : 'más de x horas después',
+	'MAXIMUM_OF_TWO_MODULES_PERMITTED' : 'Solo se permite relacionar con un máximo de dos módulos.'
 };
diff --git a/include/js/fr_fr.lang.js b/include/js/fr_fr.lang.js
@@ -361,4 +361,5 @@ var alert_arr = {
 	'LBL_LESS_THAN_HOURS_LATER' : 'less than hours later',
 	'LBL_MORE_THAN_HOURS_BEFORE' : 'more than hours before',
 	'LBL_MORE_THAN_HOURS_LATER' : 'more than hours later',
+	'MAXIMUM_OF_TWO_MODULES_PERMITTED' : 'A maximum of two modules is permitted.'
 };
diff --git a/include/js/hu_hu.lang.js b/include/js/hu_hu.lang.js
@@ -1,5 +1,4 @@
 /*********************************************************************************
-
 ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
  * ("License"); You may not use this file except in compliance with the License
  * The Original Code is:  vtiger CRM Open Source
@@ -347,4 +346,5 @@ var alert_arr = {
 	'LBL_LESS_THAN_HOURS_LATER' : 'less than hours later',
 	'LBL_MORE_THAN_HOURS_BEFORE' : 'more than hours before',
 	'LBL_MORE_THAN_HOURS_LATER' : 'more than hours later',
+	'MAXIMUM_OF_TWO_MODULES_PERMITTED' : 'A maximum of two modules is permitted.'
 };
diff --git a/include/js/it_it.lang.js b/include/js/it_it.lang.js
@@ -363,4 +363,5 @@ var alert_arr = {
 	'LBL_LESS_THAN_HOURS_LATER' : 'less than hours later',
 	'LBL_MORE_THAN_HOURS_BEFORE' : 'more than hours before',
 	'LBL_MORE_THAN_HOURS_LATER' : 'more than hours later',
+	'MAXIMUM_OF_TWO_MODULES_PERMITTED' : 'A maximum of two modules is permitted.'
 };
diff --git a/include/js/nl_nl.lang.js b/include/js/nl_nl.lang.js
@@ -327,4 +327,5 @@
 	'LBL_LESS_THAN_HOURS_LATER' : 'less than hours later',
 	'LBL_MORE_THAN_HOURS_BEFORE' : 'more than hours before',
 	'LBL_MORE_THAN_HOURS_LATER' : 'more than hours later',
+	'MAXIMUM_OF_TWO_MODULES_PERMITTED' : 'A maximum of two modules is permitted.'
 };
diff --git a/include/js/pt_br.lang.js b/include/js/pt_br.lang.js
@@ -376,4 +376,5 @@ var alert_arr = {
 	'LBL_LESS_THAN_HOURS_LATER' : 'less than hours later',
 	'LBL_MORE_THAN_HOURS_BEFORE' : 'more than hours before',
 	'LBL_MORE_THAN_HOURS_LATER' : 'more than hours later',
+	'MAXIMUM_OF_TWO_MODULES_PERMITTED' : 'A maximum of two modules is permitted.'
 };
diff --git a/modules/Reports/Reports.js b/modules/Reports/Reports.js
@@ -497,7 +497,19 @@ function changeSteps() {
 			);
 		}
 	} else {
-		document.NewRep.submit();
+		// only two related modules in report due to mysql performance limitations
+		var mods = document.getElementsByTagName("input");
+		var modsselected = 0;
+		for(var i = 0; i < mods.length; i++) {
+			if (mods[i].name.indexOf('secondarymodule_') == 0 && mods[i].checked) {
+				modsselected++;
+			}
+		}
+		if (modsselected<=2) {
+			document.NewRep.submit();
+		} else {
+			alert(alert_arr.MAXIMUM_OF_TWO_MODULES_PERMITTED);
+		}
 	}
 }
 function changeStepsback()