Attachment 49543 Details for Bug 16000 – Bug 16000 [Revised] Duplicate a report from the New Reports button

[patch] Bug 16000 [Revised] Duplicate a report from the New Reports button

Bug-16000-Revised-Duplicate-a-report-from-the-New-.patch (text/plain), 8.77 KB, created by Biblibre Sandboxes on 2016-03-24 17:29:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Biblibre Sandboxes

Created: 2016-03-24 17:29:50 UTC

Size: 8.77 KB

patch

obsolete

>From dd12fe0d5ddffd1753fc6b24624c1ba458588735 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Thu, 31 Dec 2015 10:54:55 -0500
>Subject: [PATCH] Bug 16000 [Revised] Duplicate a report from the New Reports
> button
>
>This patch creates a combined edit/duplicate/delete toolbar menu option
>similar to the one on the bibliographic detail page. Also added is the
>"Schedule" link which was previously only available from the main list
>of saved reports. Also added is some deletion confirmation JavaScript
>for deletions initiated from the toolbar.
>
>To test, apply the patch and go to Reports -> Saved reports.
>
>- Click "Show" in the menu for any saved report. The toolbar which
>  appears on this page should show the new menu items.
>- Confirm the behavior of all the buttons.
>- As you check the behavior of the button actions, check that the
>  toolbar is shown and hidden appropriately for each action.
>- Confirm that the toolbar is correctly shown or hidden when building a
>  guided report.
>- Confirm that the "Schedule" button is shown or hidden according to the
>  logged-in user's "schedule_tasks" permission.
>- Confirm that clicking the "Delete" menu option triggers a JS
>  confirmation.
>
>Revision passes the sql data to the template in the case of the
>"save_successful" screen.
>
>Signed-off-by: Christopher Brannon <cbrannon@cdalibrary.org>
>---
> .../prog/en/includes/reports-toolbar.inc           |   42 ++++++++++++--------
> .../en/modules/reports/guided_reports_start.tt     |   18 ++++++++-
> reports/guided_reports.pl                          |    1 +
> 3 files changed, 42 insertions(+), 19 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc
>index 373df25..46661c5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc
>@@ -1,7 +1,7 @@
> <div id="toolbar" class="btn-toolbar">
>     [% IF ( CAN_user_reports_create_reports ) %]
>         <div class="btn-group">
>-            <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New report <span class="caret"></span></button>
>+            <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="fa fa-fw fa-plus"></i> New report <span class="caret"></span></button>
>             <ul class="dropdown-menu">
>                 <li id="newmenuc"><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new">New guided report</a> </li>
>                 <li id="newsql"><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create%20report%20from%20SQL">New SQL report</a> </li>
>@@ -9,34 +9,42 @@
>         </div>
>     [% END %]
> 
>-    [% IF ( showsql || execute || editsql || save_successful ) %]
>+    [% IF ( showsql || execute || save_successful ) %]
>         [% IF ( CAN_user_reports_create_reports ) %]
>-            [% UNLESS ( editsql ) # Do not show edit button on edit page %]
>-                <div class="btn-group">
>-                    <a id="editreport" class="btn btn-small" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id %]&amp;phase=Edit%20SQL">
>-                        <i class="fa fa-pencil"></i> Edit
>-                    </a>
>-                </div>
>-            [% END %]
>             <div class="btn-group">
>-                <a class="btn btn-small" title="Duplicate this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create report from SQL&amp;sql=[% sql %]&amp;reportname=[% reportname %]&amp;notes=[% notes %]">
>-                    <i class="fa fa-copy"></i> Duplicate
>-                </a>
>+                <button data-toggle="dropdown" class="btn btn-small dropdown-toggle"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button>
>+                    <ul class="dropdown-menu">
>+                            <li>
>+                                <a id="editreport" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id %]&amp;phase=Edit%20SQL">
>+                                    <i class="fa fa-fw fa-pencil"></i> Edit
>+                                </a>
>+                            </li>
>+                            <li>
>+                                <a id="duplicatereport" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create report from SQL&amp;sql=[% sql |uri %]&amp;reportname=[% reportname |uri %]&amp;notes=[% notes |uri %]"><i class="fa fa-fw fa-copy"></i> Duplicate</a>
>+                            </li>
>+                            <li>
>+                                <a id="deletereport" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id %]&amp;phase=Delete%20Saved"><i class="fa fa-fw fa-trash"></i> Delete</a>
>+                            </li>
>+                    </ul>
>             </div>
>         [% END %]
> 
>-        [% IF ( CAN_user_reports_create_reports ) %]
>+        [% IF ( CAN_user_tools_schedule_tasks ) %]
>             <div class="btn-group">
>-                <a class="confirmdelete btn btn-small" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id %]&phase=Delete%20Saved">
>-                    <i class="fa fa-remove"></i> Delete
>-                </a>
>+                <a id="schedulereport" class="btn btn-small" href="/cgi-bin/koha/tools/scheduler.pl?id=[% id %]"><i class="fa fa-clock-o"></i> Schedule</a>
>+            </div>
>+        [% END %]
>+
>+        [% IF ( save_successful ) %]
>+            <div class="btn-group">
>+                <a id="showreport" class="btn btn-small" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id %]&amp;phase=Show%20SQL"><i class="fa fa-fw fa-search"></i> Show</a>
>             </div>
>         [% END %]
> 
>         [% UNLESS ( errors ) # Unless there are errors saving a report %]
>             <div class="btn-group">
>                 <a id="runreport" class="btn btn-small" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id %]&amp;phase=Run%20this%20report">
>-                    <i class="fa fa-play"></i> Run report
>+                    <i class="fa fa-fw fa-play"></i> Run report
>                 </a>
>             </div>
>             <div class="btn-group">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
>index 0a7d80f..1b40d70 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
>@@ -167,6 +167,15 @@ $(document).ready(function(){
>         }
>     });
> 
>+    $("#deletereport").on("click",function(){
>+        $(".btn-group").removeClass("open");
>+        if(confirm(_("Are you sure you want to delete this saved report?"))){
>+            return true;
>+        } else {
>+            return false;
>+        }
>+    });
>+
> [% IF (create || editsql || save) %]
>     $("#select_group").change(function() {
>         if($(this).attr('checked')) {
>@@ -230,7 +239,9 @@ $(document).ready(function(){
> [% ELSIF ( showsql ) %]&rsaquo; <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved">Saved reports</a> &rsaquo; SQL view
> [% ELSIF ( editsql ) %]&rsaquo; <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved">Saved reports</a> &rsaquo; Edit SQL report
> [% ELSIF ( execute ) %]&rsaquo; <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved">Saved reports</a> &rsaquo; <em>[% name %]</em> Report
>-[% ELSIF ( build1 || build2 || build3 || build4 || build5 || build6 ) %]&rsaquo; <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new">Build a report</a>
>+[% ELSIF ( build1 || build2 || build3 || build4 || build5 || build6 ) %]
>+    [% guided = 1 %]
>+    &rsaquo; <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new">Build a report</a>
>     [% IF ( build1 ) %]&rsaquo; Step 1 of 6: Choose a module
>     [% ELSIF ( build2 ) %]&rsaquo; Step 2 of 6: Pick a report type
>     [% ELSIF ( build3 ) %]&rsaquo; Step 3 of 6: Select columns for display
>@@ -245,7 +256,10 @@ $(document).ready(function(){
> <div id="bd">
> <div id="yui-main">
>     <div class="yui-b">
>-    [% INCLUDE "reports-toolbar.inc" %]
>+
>+    [% UNLESS ( editsql || create || enter_params || guided || save ) %]
>+        [% INCLUDE "reports-toolbar.inc" %]
>+    [% END %]
> 
> [% IF ( start ) %]
>     <h2>Guided reports</h2>
>diff --git a/reports/guided_reports.pl b/reports/guided_reports.pl
>index 4b45f95..c6f9a61 100755
>--- a/reports/guided_reports.pl
>+++ b/reports/guided_reports.pl
>@@ -240,6 +240,7 @@ elsif ( $phase eq 'Update SQL'){
>             $template->param(
>                 'save_successful'       => 1,
>                 'reportname'            => $reportname,
>+                'sql'                   => $sql,
>                 'id'                    => $id,
>             );
>             logaction( "REPORTS", "MODIFY", $id, "$reportname | $sql" ) if C4::Context->preference("ReportsLog");
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 16000: 48785 | 48829 | 49229 | 49247 | 49276 | 49277 | 49541 | 49542 | 49543 | 49544