[Koha-patches] [PATCH] corrected display bug for edit-items link in non-JS menu for editholdings permission.

[Mason James]

---
 .../intranet-tmpl/prog/en/includes/cat-toolbar.inc |   27 ++++++++++++-------
 1 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
index d5f5841..7012879 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
@@ -48,9 +48,11 @@ function confirm_deletion() {
         var editmenu = [ 
         <!-- TMPL_IF NAME="CAN_user_editcatalogue" --> 
             { text: _("Edit Record"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=&amp;op=" },
+        <!-- /TMPL_IF -->   
         <!-- TMPL_IF NAME="CAN_user_editholdings" --> 
             { text: _("Edit Items"), url: "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" },
         <!-- /TMPL_IF -->   
+        <!-- TMPL_IF NAME="CAN_user_editcatalogue" --> 
             { text: _("Edit as New (Duplicate)"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=&amp;op=duplicate" },
             { text: _("Delete Record"), <!-- TMPL_IF NAME="count" -->disabled: true, <!-- /TMPL_IF --> onclick: {fn: confirm_deletion }}, 
         <!-- /TMPL_IF -->   
@@ -107,18 +109,23 @@ function confirm_deletion() {
 	</script>
 
 
-
 <ul class="toolbar">
-    <!-- TMPL_IF EXPR="CAN_user_editcatalogue"<li><a id="newbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl">New</a></li><!-- /TMPL_IF -->
-    <!-- TMPL_IF EXPR="CAN_user_editcatalogue || CAN_user_editholdings" --><li id="editmenuc"><!-- /TMPL_IF -->
-    <!-- TMPL_IF EXPR="CAN_user_editcatalogue"
-<a id="editbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=<!--TMPL_VAR Name="current_framework" -->&amp;op=">Edit Record</a></li>
-    <!-- TMPL_IF NAME="CAN_user_editholdings" -->
-    <li><a id="edititems" href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Edit Items-h</a></li>
-    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="CAN_user_editcatalogue" --><li><a id="newbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl">New</a></li><!-- /TMPL_IF -->       
+
+    <!-- TMPL_IF EXPR="CAN_user_editcatalogue || CAN_user_editholdings" --><li id="editmenuc"><!-- /TMPL_IF -->       
+    <!-- TMPL_IF NAME="CAN_user_editcatalogue" -->
+        <a id="editbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=<!--TMPL_VAR Name="current_framework" -->&amp;op=">Edit Record</a></li>
+    <!-- /TMPL_IF -->       
+
+    <!-- TMPL_IF EXPR="CAN_user_editholdings" -->
+        <li><a id="edititems" href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Edit Items</a></li>
+    <!-- /TMPL_IF -->       
+
+    <!-- TMPL_IF NAME="CAN_user_editcatalogue" -->
+        <li><a id="duplicatebiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=<!--TMPL_VAR Name="current_framework" -->&amp;op=duplicate">Duplicate Record</a></li>
+         <li><a id="deletebiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?op=delete&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Delete</a></li>
+    <!-- /TMPL_IF -->       
 
-	<li><a id="deletebiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?op=delete&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Delete</a></li>
-	<!-- /TMPL_IF -->	
 	<li id="addtoshelfc"><a id="addtoshelf" href="/cgi-bin/koha/virtualshelves/addbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Add to shelf</a></li>
 	<li id="printbiblioc"><a id="printbiblio" href="/cgi-bin/koha/catalogue/detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Print</a></li>
 	<!-- TMPL_IF NAME="CAN_user_reserveforothers" -->
-- 
1.5.4.2