(bug #3728) fix mandatory select fields

[koha.git] / koha-tmpl / intranet-tmpl / prog / en / modules / cataloguing / addbiblio.tmpl

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 6d976d1..dbfa0f0 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
@@ -80,7 +80,7 @@ function AreMandatoriesNotOk(){
     <!-- TMPL_LOOP NAME='BIG_LOOP' -->
        <!-- TMPL_LOOP NAME='innerloop' -->
                <!-- TMPL_IF NAME="mandatory" -->
-               mandatoriesfields.push(new Array("<!-- TMPL_VAR NAME="tag" -->","<!-- TMPL_VAR NAME="index" -->"));
+               mandatoriesfields.push(new Array("<!-- TMPL_VAR NAME="tag" -->","<!-- TMPL_VAR NAME="index" --><!-- TMPL_VAR NAME="random" -->","<!-- TMPL_VAR NAME="index" -->"));
                <!-- /TMPL_IF -->
                <!-- TMPL_LOOP NAME='subfield_loop'-->
                        <!-- TMPL_IF NAME='mandatory'-->mandatories.push("<!-- TMPL_VAR NAME='id' -->");
@@ -124,21 +124,27 @@ function AreMandatoriesNotOk(){
        divid    = "tag_" + arr[0] + "_" + arr[1];
        varegexp = new RegExp("^tag_" + arr[0] + "_code_");
        
-               if(parseInt(arr[0]) > 10){
+               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]);
+                                       inputregexp = new RegExp("^tag_" + arr[0] + "_subfield_" + eleminputs[j].value + "_" + arr[2]);
                                        
                                        for( var k=0; k<len2; k++){
                                                if(eleminputs[k].id.match(inputregexp) && eleminputs[k].value){
                                                        isempty = false
                                                }
                                        }
+                                       
+                                       elemselect = elem.getElementsByTagName('select');
+                                       for( var k=0; k<elemselect.length; k++){
+                                               if(elemselect[k].id.match(inputregexp) && elemselect[k].value){
+                                                       isempty = false
+                                               }
+                                       }
                        }
                }
        }else{
@@ -746,6 +752,7 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
                 <!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
                     <!-- TMPL_IF name="mandatory" --><span class="subfield subfield_mandatory"><!-- TMPL_ELSE --><span class="subfield"><!-- /TMPL_IF -->
                         <!-- TMPL_VAR NAME="marc_lib_plain" -->
+                        <!-- TMPL_IF NAME="mandatory" --><span class="mandatory_marker" title="This field is mandatory">*</span><!-- /TMPL_IF -->
                     </span>
                     </label>
                 <!-- /TMPL_UNLESS -->