Attachment 2837 Details for Bug 2170 – Revised fix

[patch] Revised fix

0001-Updated-fix-for-Bug-2170-Adding-edititems-user-permi.patch (text/plain), 18.80 KB, created by Owen Leonard on 2010-12-13 14:16:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2010-12-13 14:16:16 UTC

Size: 18.80 KB

patch

obsolete

>From 85a1acf5d65f90a33af2368c7cb8dd0d2e2ab039 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Fri, 23 Jul 2010 14:08:26 -0400
>Subject: [PATCH] Updated fix for Bug 2170, Adding 'edititems' user-permission
>
>This patch follows up on the addition of the 'edititems'
>permission by adding a check of the new permission to places
>in the interface which link to the edit item screen.
>
>The catalogue toolbar had to be extensively re-worked in
>order to ensure that the "New" and "Edit" menus would appear
>(or not) whether or not edit_catalogue, edit_items, or
>create_subscription permissions are on.
>
>Revised for current HEAD
>---
> .../intranet-tmpl/prog/en/css/staff-global.css     |    6 +-
> .../intranet-tmpl/prog/en/includes/cat-toolbar.inc |  173 +++++++++++---------
> .../prog/en/modules/cataloguing/addbooks.tmpl      |   16 +--
> .../prog/en/modules/tools/batchMod-del.tmpl        |    2 +-
> .../prog/en/modules/tools/batchMod-edit.tmpl       |    2 +-
> 5 files changed, 111 insertions(+), 88 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
>index 55e61be..3f43f61 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
>+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
>@@ -437,6 +437,9 @@ ul.toolbar {
> 	padding-left : 0;
> }
> 
>+ul.toolbar button {
>+	padding-bottom : 2px;
>+}
> .yui-menu-button  {
> 	
> }
>@@ -923,7 +926,8 @@ fieldset.rows .inputnote {
> 	background-repeat : no-repeat;
> }
> 
>-#placehold a {
>+#placehold a,
>+#placehold button {
> 	padding-left : 34px;
> 	background-image: url("../../img/toolbar-hold.gif");
> 	background-position : center left;
>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 228ebf3..8d4e02e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
>@@ -25,6 +25,7 @@
> 	}
> 	function printBiblio() {window.open('/cgi-bin/koha/catalogue/detailprint.pl?biblionumber=','Print_Biblio','width=700,height=500,toolbar=false,scrollbars=yes');
> 	}
>+
> function confirm_deletion() {
> 		var count = ;
>         var is_confirmed;
>@@ -44,6 +45,8 @@ function confirm_deletion() {
> 		return false;
> 	}
> }
>+
>+
> function confirm_items_deletion() {
>         var count = ;
>         if(count > 0){
>@@ -54,125 +57,147 @@ function confirm_items_deletion() {
>             }
> 		}
> }
>+
> 	// prepare DOM for YUI Toolbar
> 
> 	 $(document).ready(function() {
>-	    $("#edititems").parent().remove();
>-	    $("#duplicatebiblio").parent().remove();
>+	    $("#edititems").parent().remove();
>+		$("#newitem").parent().remove();
>+	    $("#duplicatebiblio").parent().remove();
> 		$("#deletebiblio").parent().remove();
>-		$("#newitem").parent().remove();
>-		$("#newsub").parent().remove();
>-	    $("#editmenuc").empty();
>-		$("#newmenuc").empty();
>-		$("#addtoshelfc").empty();
>-		$("#printbiblioc").empty();
>+		$("#z3950searchc").empty();
>+		$("#newsub").parent().remove();
>+	    $("#newbiblio").parent().remove();
>+		$("#editbiblio").parent().remove();
>+		$("#addtoshelf").parent().remove();
>+		$("#printbiblio").parent().remove();
>+		$("#placehold").parent().remove();
> 		$("#export").remove();
>-		$("#addtoshelfc").before("<li id=\"savemenuc\"><\/li>");
>-		$("#z3950searchc").empty();
>-	    yuiToolbar();
> 	 });
> 
>-	// YUI Toolbar Functions
>-
>-	function yuiToolbar() {
>+	YAHOO.util.Event.onContentReady("cattoolbar", function () {
>+		//	Menu for new record, new item, new subscription
> 		var newmenu = [
>-			{text: _("New Record"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl" },
>-			{text: _("New Item"), url: "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=#additema" },
>-			{text: _("New Subscription"), url: "/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription="},
>+			{text: _("New Record"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl" },
>+			{text: _("New Item"), url: "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=#additema" },
>+			
>+			{text: _("New Subscription"), url: "/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription="},
> 		];
>-	
>+		if(newmenu.length){
>+			new YAHOO.widget.Button({
>+				type: "menu",
>+				label: _("New"),
>+				id: "newmenuc",
>+				name: "newmenubutton",
>+				menu: newmenu,
>+				container: this
>+			 });
>+		 }
> 	    var editmenu = [
>-	        { text: _("Edit Record"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=&amp;frameworkcode=&amp;op=" },
>-	        { text: _("Edit Items"), url: "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=" },
>-	        { text: _("Attach Item"), url: "/cgi-bin/koha/cataloguing/moveitem.pl?biblionumber=" },
>-	        { text: _("Edit as New (Duplicate)"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=&amp;frameworkcode=&amp;op=duplicate" },
>-			{ text: _("Delete Record"), onclick: {fn: confirm_deletion },id:'disabled' },
>-            { text: _("Delete all Items"), onclick: {fn: confirm_items_deletion },id:'disabled' }
>+	        { text: _("Edit Record"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=&amp;frameworkcode=&amp;op=" },
>+	        { text: _("Edit Items"), url: "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=" },
>+	        { text: _("Attach Item"), url: "/cgi-bin/koha/cataloguing/moveitem.pl?biblionumber=" },
>+	        { text: _("Edit as New (Duplicate)"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=&amp;frameworkcode=&amp;op=duplicate" },
>+			{ text: _("Delete Record"), onclick: {fn: confirm_deletion },id:'disabled' },
>+	        { text: _("Delete all Items"), onclick: {fn: confirm_items_deletion } }
> 	    ];
>-		
>+		if(editmenu.length){
>+			new YAHOO.widget.Button({
>+				type: "menu",
>+				label: _("Edit"),
>+				id: "editmenuc",
>+				name: "editmenubutton",
>+				menu: editmenu,
>+				container: this
>+			 });
>+		}
> 		var savemenu = [
>-		{ text: _("MODS (XML)"), url: "/cgi-bin/koha/catalogue/export.pl?format=mods&op=export&bib=" },
>-		{ text: _("Dublin Core (XML)"), url: "/cgi-bin/koha/catalogue/export.pl?format=dc&op=export&bib=" },
>-		{ text: _("MARCXML"), url: "/cgi-bin/koha/catalogue/export.pl?format=marcxml&op=export&bib=" },
>-		{ text: _("MARC (non-Unicode/MARC-8)"), url: "/cgi-bin/koha/catalogue/export.pl?format=marc8&op=export&bib=" },
>-		{ text: _("MARC (Unicode/UTF-8)"), url: "/cgi-bin/koha/catalogue/export.pl?format=utf8&op=export&bib=" }
>-		];
>-
>-		var addtomenu = [
>-		{ text: _("Cart"), onclick: { fn: addToCart } },
>-		{ text: _("List"),  onclick: { fn: addToShelf } }
>+			{ text: _("MODS (XML)"), url: "/cgi-bin/koha/catalogue/export.pl?format=mods&op=export&bib=" },
>+			{ text: _("Dublin Core (XML)"), url: "/cgi-bin/koha/catalogue/export.pl?format=dc&op=export&bib=" },
>+			{ text: _("MARCXML"), url: "/cgi-bin/koha/catalogue/export.pl?format=marcxml&op=export&bib=" },
>+			{ text: _("MARC (non-Unicode/MARC-8)"), url: "/cgi-bin/koha/catalogue/export.pl?format=marc8&op=export&bib=" },
>+			{ text: _("MARC (Unicode/UTF-8)"), url: "/cgi-bin/koha/catalogue/export.pl?format=utf8&op=export&bib=" }
> 		];
> 
> 	    new YAHOO.widget.Button({
> 	        type: "menu",
> 	        label: _("Save"),
>+	        id: "savemenuc",
> 	        name: "savemenubutton",
> 	        menu: savemenu,
>-	        container: "savemenuc"
>-	    });
>-
>-		new YAHOO.widget.Button({
>-	        type: "menu",
>-	        label: _("Edit"),
>-	        name: "editmenubutton",
>-	        menu: editmenu,
>-	        container: "editmenuc"
>+	        container: this
> 	    });
> 
>-		new YAHOO.widget.Button({
>-	        type: "menu",
>-	        label: _("New"),
>-	        name: "newmenubutton",
>-	        menu: newmenu,
>-	        container: "newmenuc"
>-	    });
>+	    var addtomenu = [
>+			{ text: _("Cart"), onclick: { fn: addToCart } },
>+			{ text: _("List"),  onclick: { fn: addToShelf } }
>+		];
> 
> 		new YAHOO.widget.Button({
> 	        type: "menu",
> 	        label: _("Add to"),
> 	        name: "addtomenubutton",
> 	        menu: addtomenu,
>-	        container: "addtoshelfc"
>+	        container: this
> 	    });
> 
> 		new YAHOO.widget.Button({
>-			id: "z3950search", 
>+	        id: "printbiblio",
>+	        type: "button",
>+	        label: _("Print"),
>+	        container: this,
>+			onclick: {fn: printBiblio }
>+		});
>+
>+	    new YAHOO.widget.Button({
>+			id: "placehold",
>+			type: "link",
>+			label: _("Place hold"),
>+			container: this,
>+			href: "/cgi-bin/koha/reserve/request.pl?biblionumber="
>+	     });
>+	    
>+		new YAHOO.widget.Button({
>+			id: "z3950search",
> 			type: "button", 
>-			label: _("Z39.50 Search"), 
>-			container: "z3950searchc",
>+			label: _("Z39.50 Search"),
>+			container: this,
> 			onclick: {fn:function(){PopupZ3950()}}
> 		});
>-
>-		var printbiblioButton = new YAHOO.widget.Button({
>-                                            id: "printbiblio", 
>-                                            type: "button", 
>-                                            label: _("Print"), 
>-                                            container: "printbiblioc",
>-											onclick: {fn: printBiblio }
>-                                        });
>-
>-	    var newbiblioButton = new YAHOO.widget.Button("newbiblio");
>-	    var placeholdButton = new YAHOO.widget.Button("placehold");
>-		
>-	}
>-
>+		
>+	});
> 	//]]>
> 	</script>
> 	
> <form method="post" name="f" id="f" action="/cgi-bin/koha/cataloguing/addbiblio.pl" onsubmit="return Check();">
> 
>-<ul class="toolbar">
>+<ul class="toolbar" id="cattoolbar">
>+
> 	
>-	<li id="newmenuc"><a id="newbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl">New Record</a></li>
>+	<li><a id="newbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl">New Record</a></li>
>+	
>+	
> 	<li><a id="newitem" href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=">New Item</a></li>
>+	
>+	
> 	<li><a id="newsub" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=">New Subscription</a></li>
>-	<li id="editmenuc"><a id="editbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=&amp;frameworkcode=&amp;op=">Edit Record</a></li>
>+	
>+
>+	
>+	<li><a id="editbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=&amp;frameworkcode=&amp;op=">Edit Record</a></li>
>+	
>+	
> 	<li><a id="edititems" href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=">Edit Items</a></li>
>+	
>+	
> 	<li><a id="duplicatebiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=&amp;frameworkcode=&amp;op=duplicate">Duplicate Record</a></li>
>+	
>+	
> 	<li><a id="deletebiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?op=delete&amp;biblionumber=">Delete</a></li>
> 		
>-	<li id="addtoshelfc"><a id="addtoshelf" href="/cgi-bin/koha/virtualshelves/addbybiblionumber.pl?biblionumber=">Add to shelf</a></li>
>-	<li id="printbiblioc"><a id="printbiblio" href="/cgi-bin/koha/catalogue/detailprint.pl?biblionumber=">Print</a></li>
>+
>+	<li><a id="addtoshelf" href="/cgi-bin/koha/virtualshelves/addbybiblionumber.pl?biblionumber=">Add to shelf</a></li>
>+	<li><a id="printbiblio" href="/cgi-bin/koha/catalogue/detailprint.pl?biblionumber=">Print</a></li>
> 	
> 	<li><a id="placehold" href="/cgi-bin/koha/reserve/request.pl?biblionumber=">Place Hold</a></li>
> 	
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
>index ff4eb83..943d1fb 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
>@@ -36,9 +36,9 @@
>         <tr>
>             <th>Title</th>
>             <th>Location</th>
>-            <th>preview</th>
>-            <th>&nbsp;</th>
>-            <th>&nbsp;</th>
>+            <th>Preview</th>
>+            <th>&nbsp;</th>
>+            <th>&nbsp;</th>
>         </tr>
>     
>         
>@@ -98,14 +98,8 @@
>                 </td>
> 				<td> <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=" title="MARC" rel="gb_page_center[600,500]">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;id=" title="MARC" rel="gb_page_center[600,500]">Card</a>
>                 </td>
>-                <td><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=">Edit biblio</a>
>-					<a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=" class="disabled" onclick="return false;">Edit biblio</a>
>-					
>-
>-                </td>
>-                <td>
>-                    <a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=">Add/Edit Items</a>
>-                </td>
>+                <td><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=">Edit biblio</a></td>
>+                <td><a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=">Add/Edit Items</a></td>
>             </tr>
>     
>     </table>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tmpl
>index 8f8bddb..61e901b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tmpl
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tmpl
>@@ -162,7 +162,7 @@ for( x=0; x<allColumns.length; x++ ){
> 		    
> 			<tr>
> 			    <td></td>
>-			    <td><a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&amp;biblionumber=&amp;itemnumber="></a></td>
>+			    <td><a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&amp;biblionumber=&amp;itemnumber="></a></td>
> 			    <td>Item is checked outItem has a waiting hold</td>
> 			</tr>
> 		    
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tmpl
>index a01e27f..1d6216a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tmpl
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tmpl
>@@ -100,7 +100,7 @@ for( x=0; x<allColumns.length; x++ ){
>     <ul>
>     
>   <li>
>-      <a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&amp;biblionumber=&amp;itemnumber="></a>
>+      <a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&amp;biblionumber=&amp;itemnumber="></a>
>   </li>
>     
>     </ul>
>-- 
>1.7.1
>

Actions: View | Diff | Splinter Review

Attachments on bug 2170: 524 | 525 | 526 | 527 | 528 | 2413 | 2837 | 3126