[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple addbiblio.tmpl,1.4.2.6,1.4.2.7 additem.tmpl,1.3.2.5,1.3.2.6

[Owen Leonard]

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19537/koha-tmpl/intranet-tmpl/npl/en/acqui.simple

Modified Files:
      Tag: rel_2_2
	addbiblio.tmpl additem.tmpl 
Log Message:
Fix for bug 585 (Using 'document.forms[0]' notation prevents use of other forms on page) Changing the reference from [0] to ['f'], with 'f' being the form name, seems to work fine.

Index: addbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/addbiblio.tmpl,v
retrieving revision 1.4.2.6
retrieving revision 1.4.2.7
diff -C2 -r1.4.2.6 -r1.4.2.7
*** addbiblio.tmpl	8 Jun 2005 18:38:57 -0000	1.4.2.6
--- addbiblio.tmpl	25 Aug 2005 17:59:52 -0000	1.4.2.7
***************
*** 518,526 ****
  		alert(alertString2);
  	} else {
! 		document.forms[0].submit();
  	}
  }
  function Dopop(link,i) {
! 	defaultvalue=document.forms[0].field_value[i].value;
  	newin=window.open(link+"&result="+defaultvalue,"value builder",'width=550,height=550,toolbar=false,scrollbars=yes');
  }
--- 518,526 ----
  		alert(alertString2);
  	} else {
! 		document.forms['f'].submit();
  	}
  }
  function Dopop(link,i) {
! 	defaultvalue=document.forms['f'].field_value[i].value;
  	newin=window.open(link+"&result="+defaultvalue,"value builder",'width=550,height=550,toolbar=false,scrollbars=yes');
  }
***************
*** 529,557 ****
      var strQuery="";
  	var error = 0;
! 	for (i=0 ; i<document.forms[0].field_value.length ; i++) {
! 		if (document.forms[0].kohafield[i].value == "biblioitems.isbn"){
! 			if(document.forms[0].field_value[i].value.length>0) {
! 		    strQuery += "&isbn="+document.forms[0].field_value[i].value;
  		} else {
  			error++;
  		}
  		}
! 		if (document.forms[0].kohafield[i].value == "biblio.title"){
! 			if(document.forms[0].field_value[i].value.length>0) {
! 		    strQuery += "&title="+document.forms[0].field_value[i].value;
  		} else {
  			error++;
  		}
  		}
! 		if (document.forms[0].kohafield[i].value == "biblio.author"){
! 			if(document.forms[0].field_value[i].value.length>0) {
! 		    strQuery += "&author="+document.forms[0].field_value[i].value;
  		} else { 
  			error++;
  		}
  		}
! 		if (document.forms[0].kohafield[i].value == "biblioitems.issn"){
! 			if(document.forms[0].field_value[i].value.length>0) {
! 		    strQuery += "&issn="+document.forms[0].field_value[i].value;
  		} else {
  			error++;
--- 529,557 ----
      var strQuery="";
  	var error = 0;
! 	for (i=0 ; i<document.forms['f'].field_value.length ; i++) {
! 		if (document.forms['f'].kohafield[i].value == "biblioitems.isbn"){
! 			if(document.forms['f'].field_value[i].value.length>0) {
! 		    strQuery += "&isbn="+document.forms['f'].field_value[i].value;
  		} else {
  			error++;
  		}
  		}
! 		if (document.forms['f'].kohafield[i].value == "biblio.title"){
! 			if(document.forms['f'].field_value[i].value.length>0) {
! 		    strQuery += "&title="+document.forms['f'].field_value[i].value;
  		} else {
  			error++;
  		}
  		}
! 		if (document.forms['f'].kohafield[i].value == "biblio.author"){
! 			if(document.forms['f'].field_value[i].value.length>0) {
! 		    strQuery += "&author="+document.forms['f'].field_value[i].value;
  		} else { 
  			error++;
  		}
  		}
! 		if (document.forms['f'].kohafield[i].value == "biblioitems.issn"){
! 			if(document.forms['f'].field_value[i].value.length>0) {
! 		    strQuery += "&issn="+document.forms['f'].field_value[i].value;
  		} else {
  			error++;
***************
*** 572,577 ****
  
  function AddField(field) {
! 	document.forms[0].op.value = "addfield";
! 	document.forms[0].addfield_field.value=field;
  	document.f.submit();
  }
--- 572,577 ----
  
  function AddField(field) {
! 	document.forms['f'].op.value = "addfield";
! 	document.forms['f'].addfield_field.value=field;
  	document.f.submit();
  }

Index: additem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/additem.tmpl,v
retrieving revision 1.3.2.5
retrieving revision 1.3.2.6
diff -C2 -r1.3.2.5 -r1.3.2.6
*** additem.tmpl	8 Jun 2005 18:47:47 -0000	1.3.2.5
--- additem.tmpl	25 Aug 2005 17:59:52 -0000	1.3.2.6
***************
*** 107,111 ****
  }
  function Dopop(link,i) {
! 	defaultvalue=document.forms[0].field_value[i].value;
  	newin=window.open(link+"&result="+defaultvalue,"value builder",'width=500,height=400,toolbar=false,scrollbars=yes');
  }
--- 107,111 ----
  }
  function Dopop(link,i) {
! 	defaultvalue=document.forms['f'].field_value[i].value;
  	newin=window.open(link+"&result="+defaultvalue,"value builder",'width=500,height=400,toolbar=false,scrollbars=yes');
  }