Bug 16447: Remove occurrence of the borrow permission which does no longer exist

Bug 7976 has removed this permission, but other patches re-added it...
Note that the occurrences in sendbasket.pl, edithelp.pl, opac/svc/login should
have been removed by bug 7976.

Test plan:
  git grep 'borrow.*=> 1'
should not return any results.

Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Brendan Gallagher <bredan@bywatersolutions.com>

diff --git a/basket/sendbasket.pl b/basket/sendbasket.pl
index 254d9ff..14c9882 100755 (executable)
--- a/basket/sendbasket.pl
+++ b/basket/sendbasket.pl
@@ -59,7 +59,7 @@ if ( $email_add ) {
             query           => $query,
             type            => "intranet",
             authnotrequired => 0,
-            flagsrequired   => { borrow => 1 },
+            flagsrequired   => { catalogue => 1 },
         }
     );
 

diff --git a/edithelp.pl b/edithelp.pl
index b4e75c9..dca61b1 100755 (executable)
--- a/edithelp.pl
+++ b/edithelp.pl
@@ -52,7 +52,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
             borrowers        => 1,
             permissions      => 1,
             reserveforothers => 1,
-            borrow           => 1,
             reserveforself   => 1,
             editcatalogue    => 1,
             updatecharges    => 1,

diff --git a/opac/opac-idref.pl b/opac/opac-idref.pl
index 7335008..43692dd 100755 (executable)
--- a/opac/opac-idref.pl
+++ b/opac/opac-idref.pl
@@ -37,7 +37,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         query           => $cgi,
         type            => "opac",
         authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
-        flagsrequired   => { borrow => 1 },
     }
 );
 

diff --git a/opac/opac-news-rss.pl b/opac/opac-news-rss.pl
index 7b1fe9b..95cbd6d 100755 (executable)
--- a/opac/opac-news-rss.pl
+++ b/opac/opac-news-rss.pl
@@ -34,7 +34,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         type            => "opac",
         query           => $input,
         authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
-        flagsrequired   => { borrow => 1 },
     }
 );
 

diff --git a/opac/opac-restrictedpage.pl b/opac/opac-restrictedpage.pl
index fbed158..2fc31b6 100755 (executable)
--- a/opac/opac-restrictedpage.pl
+++ b/opac/opac-restrictedpage.pl
@@ -40,7 +40,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         query           => $query,
         type            => "opac",
         authnotrequired => $withinNetwork,
-        flagsrequired   => { borrow => 1 },
         debug           => 1,
     }
 );

diff --git a/opac/svc/login b/opac/svc/login
index e871f74..0b6298d 100755 (executable)
--- a/opac/svc/login
+++ b/opac/svc/login
@@ -43,7 +43,7 @@ if ( $response->is_success ) {
     my $content      = $response->decoded_content();
     my $decoded_json = decode_json($content);
     my ( $userid, $cookie, $sessionID ) =
-      checkauth( $query, 1,  { borrow => 1 }, 'opac', $decoded_json->{'email'} );
+      checkauth( $query, 1,  {}, 'opac', $decoded_json->{'email'} );
     if ($userid) { # a valid user has logged in
         print $query->header( -cookie => $cookie );
         print $decoded_json;

diff --git a/t/db_dependent/Auth.t b/t/db_dependent/Auth.t
index 68e3ebc..3077969 100644 (file)
--- a/t/db_dependent/Auth.t
+++ b/t/db_dependent/Auth.t
@@ -37,7 +37,7 @@ $dbh->{RaiseError} = 1;
         # we don't need to bother about permissions for this test
         my $flags = {
             superlibrarian    => 1, acquisition       => 0,
-            borrow            => 0, borrowers         => 0,
+            borrowers         => 0,
             catalogue         => 1, circulate         => 0,
             coursereserves    => 0, editauthorities   => 0,
             editcatalogue     => 0, management        => 0,