From fa7d9815b3169ac377bc7ffb93b14f5091e05e27 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Sat, 24 Oct 2020 13:42:05 +1300 Subject: [PATCH] Bug 19532: (follow-up) aria-hidden attr on OPAC, and more - removing authnotrequired flag from scripts - fixing opac buttons - chmod +x for recalls test files Signed-off-by: David Nind Signed-off-by: David Nind Signed-off-by: Marcel de Rooy Signed-off-by: Fridolin Somers --- .../opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 4 ++-- members/recallshistory.pl | 1 - opac/opac-recall.pl | 1 - opac/opac-recalls.pl | 1 - recalls/recall_pickup_slip.pl | 1 - recalls/recalls_old_queue.pl | 1 - recalls/recalls_overdue.pl | 1 - recalls/recalls_queue.pl | 1 - recalls/recalls_to_pull.pl | 1 - recalls/recalls_waiting.pl | 1 - recalls/request.pl | 1 - t/db_dependent/Koha/Recall.t | 0 t/db_dependent/Koha/Recalls.t | 0 15 files changed, 4 insertions(+), 14 deletions(-) mode change 100644 => 100755 t/db_dependent/Koha/Recall.t mode change 100644 => 100755 t/db_dependent/Koha/Recalls.t diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc index 63b9a91dcb..a76406b254 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc @@ -12,7 +12,7 @@ [% END %] [% IF Koha.Preference('UseRecalls') %] -
  • +
  • Place recall
    • [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt index 9cec6a056e..83d4793479 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recall.tt @@ -151,7 +151,7 @@
    - + Cancel
    diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt index b06fb5bf13..d0bcbb43a4 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -816,7 +816,7 @@ - + [% END %] @@ -1205,7 +1205,7 @@ }); } - $("#cancel_recall").click(function(e){ + $(".cancel_recall").click(function(e){ return confirmDelete(_("Are you sure you want to remove this recall?")); }); diff --git a/members/recallshistory.pl b/members/recallshistory.pl index c67901931f..851d0005d6 100755 --- a/members/recallshistory.pl +++ b/members/recallshistory.pl @@ -27,7 +27,6 @@ my ($template, $loggedinuser, $cookie)= get_template_and_user( template_name => "members/recallshistory.tt", query => $input, type => "intranet", - authnotrequired => 0, flagsrequired => { recalls => 1 }, debug => 1, } diff --git a/opac/opac-recall.pl b/opac/opac-recall.pl index fbc2cd0d8c..779a126b84 100755 --- a/opac/opac-recall.pl +++ b/opac/opac-recall.pl @@ -29,7 +29,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( template_name => "opac-recall.tt", query => $query, type => "opac", - authnotrequired => 0, } ); diff --git a/opac/opac-recalls.pl b/opac/opac-recalls.pl index 96b0c788db..59c657bf59 100755 --- a/opac/opac-recalls.pl +++ b/opac/opac-recalls.pl @@ -29,7 +29,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( template_name => "opac-recalls.tt", query => $input, type => "opac", - authnotrequired => 0, } ); diff --git a/recalls/recall_pickup_slip.pl b/recalls/recall_pickup_slip.pl index cc6a02e73a..7137e59571 100755 --- a/recalls/recall_pickup_slip.pl +++ b/recalls/recall_pickup_slip.pl @@ -30,7 +30,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( template_name => "circ/printslip.tt", query => $input, type => "intranet", - authnotrequired => 0, flagsrequired => { circulate => "circulate_remaining_permissions" }, } ); diff --git a/recalls/recalls_old_queue.pl b/recalls/recalls_old_queue.pl index ed826774ab..bdabc46b7d 100755 --- a/recalls/recalls_old_queue.pl +++ b/recalls/recalls_old_queue.pl @@ -28,7 +28,6 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user( template_name => "recalls/recalls_old_queue.tt", query => $query, type => "intranet", - authnotrequired => 0, flagsrequired => { recalls => "manage_recalls" }, debug => 1, } diff --git a/recalls/recalls_overdue.pl b/recalls/recalls_overdue.pl index 82b755ccf3..3c73dd34e7 100755 --- a/recalls/recalls_overdue.pl +++ b/recalls/recalls_overdue.pl @@ -29,7 +29,6 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user( template_name => "recalls/recalls_overdue.tt", query => $query, type => "intranet", - authnotrequired => 0, flagsrequired => { recalls => "manage_recalls" }, debug => 1, } diff --git a/recalls/recalls_queue.pl b/recalls/recalls_queue.pl index 59ceb00314..5676ca815f 100755 --- a/recalls/recalls_queue.pl +++ b/recalls/recalls_queue.pl @@ -28,7 +28,6 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user( template_name => "recalls/recalls_queue.tt", query => $query, type => "intranet", - authnotrequired => 0, flagsrequired => { recalls => 'manage_recalls' }, debug => 1, } diff --git a/recalls/recalls_to_pull.pl b/recalls/recalls_to_pull.pl index 1665221bb7..5b2bfbddd4 100755 --- a/recalls/recalls_to_pull.pl +++ b/recalls/recalls_to_pull.pl @@ -28,7 +28,6 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user( template_name => "recalls/recalls_to_pull.tt", query => $query, type => "intranet", - authnotrequired => 0, flagsrequired => { recalls => 'manage_recalls' }, debug => 1, } diff --git a/recalls/recalls_waiting.pl b/recalls/recalls_waiting.pl index 0814ffaa25..f18d5c0367 100755 --- a/recalls/recalls_waiting.pl +++ b/recalls/recalls_waiting.pl @@ -31,7 +31,6 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user( template_name => "recalls/recalls_waiting.tt", query => $query, type => "intranet", - authnotrequired => 0, flagsrequired => { recalls => "manage_recalls" }, debug => 1, } diff --git a/recalls/request.pl b/recalls/request.pl index 59a4b4555b..04e6cd0829 100755 --- a/recalls/request.pl +++ b/recalls/request.pl @@ -30,7 +30,6 @@ my ($template, $loggedinuser, $cookie)= get_template_and_user( template_name => "recalls/request.tt", query => $input, type => "intranet", - authnotrequired => 0, flagsrequired => { recalls => "manage_recalls" }, debug => 1, } diff --git a/t/db_dependent/Koha/Recall.t b/t/db_dependent/Koha/Recall.t old mode 100644 new mode 100755 diff --git a/t/db_dependent/Koha/Recalls.t b/t/db_dependent/Koha/Recalls.t old mode 100644 new mode 100755 -- 2.39.5