From 04a05f712c0cacee9a038900909c103fc74f1e01 Mon Sep 17 00:00:00 2001 From: oleonard Date: Thu, 25 Aug 2005 17:59:52 +0000 Subject: [PATCH] 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. --- .../npl/en/acqui.simple/addbiblio.tmpl | 34 +++++++++---------- .../npl/en/acqui.simple/additem.tmpl | 2 +- .../npl/en/authorities/authorities.tmpl | 20 +++++------ .../intranet-tmpl/npl/en/bull/search.tmpl | 18 ++-------- .../npl/en/search.marc/search.tmpl | 2 +- .../npl/en/search.marc/suggest.tmpl | 4 +-- 6 files changed, 33 insertions(+), 47 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/addbiblio.tmpl index a602ca4108..0d74cd482f 100644 --- a/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/addbiblio.tmpl +++ b/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/addbiblio.tmpl @@ -517,42 +517,42 @@ function Check(f) { } alert(alertString2); } else { - document.forms[0].submit(); + document.forms['f'].submit(); } } function Dopop(link,i) { - defaultvalue=document.forms[0].field_value[i].value; + defaultvalue=document.forms['f'].field_value[i].value; newin=window.open(link+"&result="+defaultvalue,"value builder",'width=550,height=550,toolbar=false,scrollbars=yes'); } function PopupZ3950() { var strQuery=""; var error = 0; - for (i=0 ; i0) { - strQuery += "&isbn="+document.forms[0].field_value[i].value; + for (i=0 ; i0) { + strQuery += "&isbn="+document.forms['f'].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; + 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[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; + 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[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; + 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++; } @@ -571,8 +571,8 @@ function Changefwk(FwkList) { } function AddField(field) { - document.forms[0].op.value = "addfield"; - document.forms[0].addfield_field.value=field; + document.forms['f'].op.value = "addfield"; + document.forms['f'].addfield_field.value=field; document.f.submit(); } diff --git a/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/additem.tmpl b/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/additem.tmpl index 7c8349c85a..428ae5b635 100644 --- a/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/additem.tmpl +++ b/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/additem.tmpl @@ -106,7 +106,7 @@ function Check(f) { } } function Dopop(link,i) { - defaultvalue=document.forms[0].field_value[i].value; + defaultvalue=document.forms['f'].field_value[i].value; newin=window.open(link+"&result="+defaultvalue,"value builder",'width=500,height=400,toolbar=false,scrollbars=yes'); } function confirm_deletion(bibid,itemnum) { diff --git a/koha-tmpl/intranet-tmpl/npl/en/authorities/authorities.tmpl b/koha-tmpl/intranet-tmpl/npl/en/authorities/authorities.tmpl index a3096110a6..776f4693fc 100644 --- a/koha-tmpl/intranet-tmpl/npl/en/authorities/authorities.tmpl +++ b/koha-tmpl/intranet-tmpl/npl/en/authorities/authorities.tmpl @@ -160,24 +160,24 @@ function Check(f) { } } function Dopop(link,i) { - defaultvalue=document.forms[0].field_value[i].value; + defaultvalue=document.forms['f'].field_value[i].value; newin=window.open(link+"&result="+defaultvalue,"value builder",'width=550,height=550,toolbar=false,scrollbars=yes'); } function PopupZ3950() { var strQuery=""; - for (i=0 ; i0) { - strQuery += "&isbn="+document.forms[0].field_value[i].value; + for (i=0 ; i0) { + strQuery += "&isbn="+document.forms['f'].field_value[i].value; } - if (document.forms[0].kohafield[i].value == "biblio.title" && document.forms[0].field_value[i].value.length>0) { - strQuery += "&title="+document.forms[0].field_value[i].value; + if (document.forms['f'].kohafield[i].value == "biblio.title" && document.forms['f'].field_value[i].value.length>0) { + strQuery += "&title="+document.forms['f'].field_value[i].value; } - if (document.forms[0].kohafield[i].value == "biblio.author" &&document.forms[0].field_value[i].value.length>0) { - strQuery += "&author="+document.forms[0].field_value[i].value; + if (document.forms['f'].kohafield[i].value == "biblio.author" &&document.forms['f'].field_value[i].value.length>0) { + strQuery += "&author="+document.forms['f'].field_value[i].value; } - if (document.forms[0].kohafield[i].value == "biblioitems.issn" && document.forms[0].field_value[i].value.length>0) { - strQuery += "&issn="+document.forms[0].field_value[i].value; + if (document.forms['f'].kohafield[i].value == "biblioitems.issn" && document.forms['f'].field_value[i].value.length>0) { + strQuery += "&issn="+document.forms['f'].field_value[i].value; } } newin=window.open("../z3950/search.pl?bibid="+strQuery,"z3950search",'width=500,height=400,toolbar=false,scrollbars=yes'); diff --git a/koha-tmpl/intranet-tmpl/npl/en/bull/search.tmpl b/koha-tmpl/intranet-tmpl/npl/en/bull/search.tmpl index 3050bba059..ad985d6908 100644 --- a/koha-tmpl/intranet-tmpl/npl/en/bull/search.tmpl +++ b/koha-tmpl/intranet-tmpl/npl/en/bull/search.tmpl @@ -32,24 +32,10 @@ -