Bug 14957: (QA follow-up) Update for bug 26703

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Bug 14957: (QA follow-up) Update for bug 20054

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Bug 14957: (QA follow-up) Update for bug 20053

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Bug 14957: (QA follow-up) Update for bug 23271

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

diff --git a/admin/marc-overlay-rules.pl b/admin/marc-overlay-rules.pl
index dcc4f1d..bea0a95 100755 (executable)
--- a/admin/marc-overlay-rules.pl
+++ b/admin/marc-overlay-rules.pl
@@ -66,9 +66,7 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user(
         template_name   => "admin/marc-overlay-rules.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { parameters => 'manage_marc_overlay_rules' },
-        debug           => 1,
     }
 );
 
@@ -152,7 +150,7 @@ else {
     $rules = $get_rules->();
 }
 
-my $categorycodes = Koha::Patron::Categories->search_limited({}, {order_by => ['description']});
+my $categorycodes = Koha::Patron::Categories->search_with_library_limits({}, {order_by => ['description']});
 $template->param( rules => $rules, categorycodes => $categorycodes, messages => $errors );
 
 output_html_with_http_headers $input, $cookie, $template->output;

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt
index ecf8f73..18bc916 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt
@@ -1,18 +1,18 @@
 [% USE raw %]
 [% USE Koha %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; MARC overlay rules</title>
+<title>MARC overlay rules &rsaquo; Koha &rsaquo; Administration</title>
 [% INCLUDE 'doc-head-close.inc' %]
 [% Asset.css("css/datatables.css") | $raw %]
 [% INCLUDE 'datatables.inc' %]
 
-<style type="text/css">
+<style>
     .required {
         background-color: #C00;
     }
 </style>
 
-<script type="text/javascript">
+<script>
 function doSubmit(op, id) {
     $('<input type="hidden"/>')
     .attr('name', 'op')