From b4ba1c69815e2a1bcccbbef781a26e74a17686aa Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Fri, 18 May 2012 10:46:01 -0400
Subject: [PATCH] Bug 8161 - Cataloging home page should be accessible to
 users with permission to edit catalog or edit items
Content-Type: text/plain; charset="utf-8"

This patch modifies the permissions required to access the cataloging
home page (addbooks.pl) so that the user requires edit_catalogue,
edit_items, or fast_cataloging permission.

Users with only edit_catalogue permission will only see biblio edit
links. Users with edit_items permission will only see item edit
links. Users with fast_cataloging permission will only be able to
view information about contents of the catalog--useless for them
but I'm not sure how better to handle it.

To test, log in as a user with each of the above permissions
enabled separately and in combination and test access.
---
 cataloguing/addbooks.pl                            |    2 +-
 .../prog/en/modules/cataloguing/addbooks.tt        |   11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/cataloguing/addbooks.pl b/cataloguing/addbooks.pl
index b768a29..79534a4 100755
--- a/cataloguing/addbooks.pl
+++ b/cataloguing/addbooks.pl
@@ -49,7 +49,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { editcatalogue => 'edit_catalogue' },
+        flagsrequired   => { editcatalogue => '*' },
         debug           => 1,
     }
 );
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
index 03c31ed..85ee254 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
@@ -19,7 +19,7 @@
    <div id="bd">
 	<div id="yui-main">
 
-[% INCLUDE 'cataloging-toolbar.inc' %]
+[% IF ( CAN_user_editcatalogue_edit_catalogue ) %][% INCLUDE 'cataloging-toolbar.inc' %][% END %]
 
 	[% IF ( noitemsfound ) %]
 		No results found
@@ -125,7 +125,7 @@
                 <th>Edition</th>
                 <th>Coming from</th>
                 <th>Preview</th>
-                <th>&nbsp;</th>
+                [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]<th>&nbsp;</th>[% END %]
             </tr>
             [% FOREACH breeding_loo IN breeding_loop %]
             [% IF ( loop.odd ) %]
@@ -141,10 +141,9 @@
                 <td>[% breeding_loo.file %]</td>
                 <td> <a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.id %]" title="MARC" rel="gb_page_center[600,500]">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.id %]" title="MARC" rel="gb_page_center[600,500]">Card</a>
 				</td>
-                <td>
-                    [% UNLESS ( CAN_user_editcatalogue_edit_catalogue ) %]<a href="/cgi-bin/koha/cataloguing/addbiblio.pl?breedingid=[% breeding_loo.id %]" class="disabled" onclick="return false;">Add biblio</a>
-                    [% ELSE %]<a href="/cgi-bin/koha/cataloguing/addbiblio.pl?breedingid=[% breeding_loo.id %]">Add biblio</a>[% END %]
-                </td>
+                [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]<td>
+                    <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?breedingid=[% breeding_loo.id %]">Add biblio</a>
+                </td>[% END %]
             </tr>
             [% END %]
         </table>
-- 
1.7.9.5