Attachment 105725 Details for Bug 25627 – Bug 25627: Move OPAC problem reports from administration to tools

[patch] Bug 25627: Move OPAC problem reports from administration to tools

Bug-25627-Move-OPAC-problem-reports-from-administr.patch (text/plain), 8.59 KB, created by David Nind on 2020-06-11 10:48:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Nind

Created: 2020-06-11 10:48:42 UTC

Size: 8.59 KB

patch

obsolete

>From 36cbe40feb75592947e846acc9300d458712804c Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Thu, 4 Jun 2020 11:51:38 +0000
>Subject: [PATCH] Bug 25627: Move OPAC problem reports from administration to
> tools
>
>This patch moves the OPAC problem report management page from the
>Administration section to the Tools section.
>
>I think this makes sense because management of reports is an ongoing
>task, not a configuration.
>
>To test, apply the patch and enable the OPACReportProblem system
>preference.
>
> - Go to Administration. There should be no link to OPAC problem
>   reports.
>   - Open an administration page which shows the Administration menu in
>     the left-hand sidebar, e.g. Libraries. There should be no link to
>     OPAC problem reports in the menu.
> - Go to Tools. There should be a link to OPAC problem reports in the
>   "Addional tools" section.
>   - Open the OPAC problem reports page and confirm that it works
>     correctly.
>   - The breadcrumbs menu should show "Tools > OPAC problem reports."
>   - Confirm that the link in the sidebar menu works correctly.
> - If necessary, submit an OPAC problem report via the OPAC so that
>   there is a pending report. Go to the staff interface home page and
>   check that the "OPAC problem reports pending" link works correctly.
>
>Signed-off-by: David Nind <david@davidnind.com>
>---
> koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc             | 3 ---
> koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc             | 3 +++
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt         | 4 ----
> koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt            | 2 +-
> .../prog/en/modules/{admin => tools}/problem-reports.tt             | 6 +++---
> koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt         | 5 +++++
> {admin => tools}/problem-reports.pl                                 | 2 +-
> 7 files changed, 13 insertions(+), 12 deletions(-)
> rename koha-tmpl/intranet-tmpl/prog/en/modules/{admin => tools}/problem-reports.tt (98%)
> rename {admin => tools}/problem-reports.pl (97%)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
>index 53d1610c4e..1be43b1fbd 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
>@@ -151,9 +151,6 @@
>             [% IF ( Koha.Preference('EnableAdvancedCatalogingEditor') && CAN_user_parameters_manage_keyboard_shortcuts ) %]
>                 <li><a href="/cgi-bin/koha/admin/adveditorshortcuts.pl">Keyboard shortcuts</a></li>
>             [% END %]
>-            [% IF ( Koha.Preference('OPACReportProblem') && CAN_user_problem_reports ) %]
>-                <li><a href="/cgi-bin/koha/admin/problem-reports.pl">OPAC problem reports</a></li>
>-            [% END %]
>         </ul>
>     [% END %]
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
>index 6526d0c3cb..ba3f54a281 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
>@@ -133,6 +133,9 @@
>     [% IF ( CAN_user_tools_access_files ) %]
>     <li><a href="/cgi-bin/koha/tools/access_files.pl">Access files</a></li>
>     [% END %]
>+    [% IF ( Koha.Preference('OPACReportProblem') && CAN_user_problem_reports ) %]
>+        <li><a href="/cgi-bin/koha/tools/problem-reports.pl">OPAC problem reports</a></li>
>+    [% END %]
> </ul>
> [% END %]
> </div></div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
>index bb6a94b811..f1ef9fc643 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
>@@ -240,10 +240,6 @@
>                         <dt><a href="/cgi-bin/koha/admin/adveditorshortcuts.pl">Keyboard shortcuts</a></dt>
>                         <dd>Define which keys trigger actions in the advanced cataloging editor</dd>
>                     [% END %]
>-                    [% IF ( Koha.Preference('OPACReportProblem') && CAN_user_problem_reports ) %]
>-                        <dt><a href="/cgi-bin/koha/admin/problem-reports.pl">OPAC problem reports</a></dt>
>-                        <dd>Manage OPAC problem reports submitted by patrons</dd>
>-                    [% END %]
>                 </dl>
>             [% END %]
>             </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
>index 1ec2e3d852..d621db5cc7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
>@@ -190,7 +190,7 @@
> 
>                                 [% IF ( Koha.Preference('OPACReportProblem') && CAN_user_problem_reports && pending_problem_reports ) %]
>                                     <div class="pending-info" id="problem_reports_pending">
>-                                        <a href="/cgi-bin/koha/admin/problem-reports.pl">OPAC problem reports pending</a>:
>+                                        <a href="/cgi-bin/koha/tools/problem-reports.pl">OPAC problem reports pending</a>:
>                                         <span class="pending-number-link">[% pending_problem_reports.count | html %]</span>
>                                     </div>
>                                 [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/problem-reports.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/problem-reports.tt
>similarity index 98%
>rename from koha-tmpl/intranet-tmpl/prog/en/modules/admin/problem-reports.tt
>rename to koha-tmpl/intranet-tmpl/prog/en/modules/tools/problem-reports.tt
>index b2e0ea5a08..889a235733 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/problem-reports.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/problem-reports.tt
>@@ -14,7 +14,7 @@
> [% INCLUDE 'prefs-admin-search.inc' %]
> <div id="breadcrumbs">
>     <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
>-    <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo;
>+    <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo;
>     OPAC problem reports
> </div>
> 
>@@ -42,7 +42,7 @@
>             [% END %]
> 
>             [% IF ( problem_reports.count ) %]
>-                <form id="mark_selected" method="post" action="/cgi-bin/koha/admin/problem-reports.pl">
>+                <form id="mark_selected" method="post" action="/cgi-bin/koha/tools/problem-reports.pl">
>                     <div id="toolbar" class="btn-toolbar">
>                         <button type="submit" class="btn btn-default markviewed" name="mark_selected-viewed" value="viewed" disabled="disabled"><i class="fa fa-eye"></i> Mark viewed</button>
>                         <button type="submit" class="btn btn-default markclosed" name="mark_selected-closed" value="closed" disabled="disabled"><i class="fa fa-times-circle"></i> Mark closed</button>
>@@ -109,7 +109,7 @@
> 
>         <div class="col-sm-2 col-sm-pull-10">
>             <aside>
>-                [% INCLUDE 'admin-menu.inc' %]
>+                [% INCLUDE 'tools-menu.inc' %]
>             </aside>
>         </div> 
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
>index f0a35aa359..ae4608c684 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
>@@ -78,6 +78,7 @@
>     <dt><a href="/cgi-bin/koha/tools/picture-upload.pl">Upload patron images</a></dt>
>     <dd>Upload patron images in a batch or one at a time</dd>
>     [% END %]
>+
>     </dl>
> </div>
> 
>@@ -141,6 +142,10 @@
>         [% END %]
>     [% END %]
> 
>+    [% IF ( Koha.Preference('OPACReportProblem') && CAN_user_problem_reports ) %]
>+        <dt><a href="/cgi-bin/koha/tools/problem-reports.pl">OPAC problem reports</a></dt>
>+        <dd>Manage OPAC problem reports submitted by patrons</dd>
>+    [% END %]
> 
> </dl>
> </div>
>diff --git a/admin/problem-reports.pl b/tools/problem-reports.pl
>similarity index 97%
>rename from admin/problem-reports.pl
>rename to tools/problem-reports.pl
>index 70b97276c2..c9a1afd222 100755
>--- a/admin/problem-reports.pl
>+++ b/tools/problem-reports.pl
>@@ -29,7 +29,7 @@ my $query = new CGI;
> 
> my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
>     {
>-        template_name   => "admin/problem-reports.tt",
>+        template_name   => "tools/problem-reports.tt",
>         query           => $query,
>         type            => "intranet",
>         authnotrequired => 0,
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 25627: 105549 | 105725 | 105734 | 105735