[Koha-patches] [PATCH] [FollowUp] (bug #3170) do not check fields < 010

Nahuel ANGELINETTI nahuel.angelinetti at biblibre.com
Fri May 29 12:32:46 CEST 2009


This patch add a if, to disallow the check of fields < 010, because they could have no subfields, and are mandatory.
---
 .../prog/en/modules/authorities/authorities.tmpl   |   32 ++++++++++--------
 .../prog/en/modules/cataloguing/addbiblio.tmpl     |   36 +++++++++++---------
 2 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl
index f32e445..d07bd46 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl
@@ -68,21 +68,25 @@ function AreMandatoriesNotOk(){
     	divid    = "tag_" + arr[0] + "_" + arr[1];
     	varegexp = new RegExp("^tag_" + arr[0] + "_code_");
 
-    	elem = document.getElementById(divid);
-    	eleminputs = elem.getElementsByTagName('input');
-    	
-    	for(var j=0,len2=eleminputs.length; j<len2; j++){
-
-    		if(eleminputs[j].name.match(varegexp) && eleminputs[j].value){
-				/* tag_801_subfield_c_841304_545657 */
-				inputregexp = new RegExp("^tag_" + arr[0] + "_subfield_" + eleminputs[j].value + "_" + arr[1]);
-				
-				for( var k=0; k<len2; k++){
-					if(eleminputs[k].id.match(inputregexp) && eleminputs[k].value){
-						isempty = false
+		if(parseInt(arr[0]) > 10){
+	    	elem = document.getElementById(divid);
+	    	eleminputs = elem.getElementsByTagName('input');
+	    	
+	    	for(var j=0,len2=eleminputs.length; j<len2; j++){
+	
+	    		if(eleminputs[j].name.match(varegexp) && eleminputs[j].value){
+					/* tag_801_subfield_c_841304_545657 */
+					inputregexp = new RegExp("^tag_" + arr[0] + "_subfield_" + eleminputs[j].value + "_" + arr[1]);
+					
+					for( var k=0; k<len2; k++){
+						if(eleminputs[k].id.match(inputregexp) && eleminputs[k].value){
+							isempty = false
+						}
 					}
-				}
-    		}
+	    		}
+	    	}
+    	}else{
+    		isempty = false;
     	}
     	
     	if(isempty){
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
index 0927720..95caf4b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
@@ -119,26 +119,30 @@ function AreMandatoriesNotOk(){
     
     /* Check for mandatories field(not subfields) */
     for(var i=0,len=mandatoriesfields.length; i<len; i++){
-    	isempty  = true;
-    	arr      = mandatoriesfields[i];
+	    isempty  = true;
+		arr      = mandatoriesfields[i];
     	divid    = "tag_" + arr[0] + "_" + arr[1];
     	varegexp = new RegExp("^tag_" + arr[0] + "_code_");
-
-    	elem = document.getElementById(divid);
-    	eleminputs = elem.getElementsByTagName('input');
     	
-    	for(var j=0,len2=eleminputs.length; j<len2; j++){
-
-    		if(eleminputs[j].name.match(varegexp) && eleminputs[j].value){
-				/* tag_801_subfield_c_841304_545657 */
-				inputregexp = new RegExp("^tag_" + arr[0] + "_subfield_" + eleminputs[j].value + "_" + arr[1]);
-				
-				for( var k=0; k<len2; k++){
-					if(eleminputs[k].id.match(inputregexp) && eleminputs[k].value){
-						isempty = false
+		if(parseInt(arr[0]) > 10){
+	    	elem = document.getElementById(divid);
+	    	eleminputs = elem.getElementsByTagName('input');
+	    	
+	    	for(var j=0,len2=eleminputs.length; j<len2; j++){
+	
+	    		if(eleminputs[j].name.match(varegexp) && eleminputs[j].value){
+					/* tag_801_subfield_c_841304_545657 */
+					inputregexp = new RegExp("^tag_" + arr[0] + "_subfield_" + eleminputs[j].value + "_" + arr[1]);
+					
+					for( var k=0; k<len2; k++){
+						if(eleminputs[k].id.match(inputregexp) && eleminputs[k].value){
+							isempty = false
+						}
 					}
-				}
-    		}
+	    		}
+	    	}
+    	}else{
+    		isempty = false;
     	}
     	
     	if(isempty){
-- 
1.6.0.4




More information about the Koha-patches mailing list