[Koha-patches] [PATCH] fixes to edit_items granular permission

[Galen Charlton]

* cataloging toolbar now properly handles case where
  staff user has permission to edit items but not bibs
* fixed wrong permission introduced in the bib details page
  that prevented circulation users from being able to
  change item statuses, which is the very point of that
  page.  A possible future direction is to introduce
  another permission for the benefit of circulation staff
  who need to be able to change item statues, e.g., a
  circulate/change_item_status.

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 .../intranet-tmpl/prog/en/includes/cat-toolbar.inc |   17 +++++++++++++++++
 .../prog/en/modules/catalogue/moredetail.tmpl      |    2 +-
 2 files changed, 18 insertions(+), 1 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 eda7985..3dfceac 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
@@ -75,12 +75,19 @@ function confirm_items_deletion() {
 	// YUI Toolbar Functions
 
 	function yuiToolbar() {
+	<!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_catalogue" -->
 		var newmenu = [
 			{text: _("New Record"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl" },
 			{text: _("New Item"), url: "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->#additema" },
 			{text: _("New Subscription"), url: "/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=<!-- TMPL_VAR NAME="biblionumber" -->"},
 		];
+    <!-- TMPL_ELSIF NAME="CAN_user_editcatalogue_edit_items" -->
+		var newmenu = [
+			{text: _("New Item"), url: "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->#additema" }
+		];
+    <!-- /TMPL_IF -->
 	
+	<!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_catalogue" -->
 	    var editmenu = [
 	        { text: _("Edit Record"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=&amp;op=" },
 	        { text: _("Edit Items"), url: "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" },
@@ -89,6 +96,12 @@ function confirm_items_deletion() {
 			{ text: _("Delete Record"), onclick: {fn: confirm_deletion }<!-- TMPL_IF NAME="count" -->,id:'disabled'<!-- /TMPL_IF --> },
             { text: _("Delete all Items"), onclick: {fn: confirm_items_deletion } }
 	    ];
+    <!-- TMPL_ELSIF NAME="CAN_user_editcatalogue_edit_items" -->
+	    var editmenu = [
+	        { text: _("Edit Items"), url: "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" },
+            { text: _("Delete all Items"), onclick: {fn: confirm_items_deletion } }
+	    ];
+    <!-- /TMPL_IF -->
 		
 		var savemenu = [
 		{ text: _("MODS (XML)"), url: "/cgi-bin/koha/catalogue/export.pl?format=mods&op=export&bib=<!-- TMPL_VAR NAME="biblionumber" -->" },
@@ -170,6 +183,10 @@ function confirm_items_deletion() {
 	<li><a id="edititems" href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Edit Items</a></li>
 	<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_ELSIF NAME="CAN_user_editcatalogue_edit_items" -->
+        <!-- handle case of of somebody who is allowed to edit items -->
+	    <li id="newmenuc"><a  href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">New Item</a></li>
+	    <li id="editmenuc"><a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Edit Items</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>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
index 8577193..93a46a5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
@@ -167,7 +167,7 @@
 		<!-- TMPL_IF NAME="card2" --><li><span class="label">Previous Borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=<!-- TMPL_VAR NAME="borrower2" -->"><!-- TMPL_VAR NAME="card2" --></a>&nbsp;</li><!-- /TMPL_IF -->
                 <li><span class="label">Paid for?:</span> <!-- TMPL_VAR NAME="paidfor" -->&nbsp;</li>
             <li><span class="label">Public Note:</span>
-                <!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_items" -->
+                <!-- TMPL_IF NAME="CAN_user_circulate" -->
               <form class="inline" action="updateitem.pl" method="post"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR Name="biblionumber" -->" />
                     <input type="hidden" name="biblioitemnumber" value="<!-- TMPL_VAR Name="biblioitemnumber" -->" /><input type="hidden" name="itemnumber" value="<!-- TMPL_VAR Name="itemnumber" -->" />
                     <textarea name="itemnotes" rows="2" cols="30"><!-- TMPL_VAR NAME="itemnotes" --></textarea><input type="submit" name="submit" class="submit" value="Update" />
-- 
1.7.0