(bug #3170) do not check fields < 010

This patch add a if, to disallow the check of fields < 010, because they could have no subfields, and are mandatory.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>

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 (file)
--- 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 ca9b6a3..6d976d1 100644 (file)
--- 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){