Attachment 171130 Details for Bug 37763 – Bug 37763: Do not show SQL report editor after 'Update and run'

[patch] Bug 37763: Do not show SQL report editor after 'Update and run'

Bug-37763-Do-not-show-SQL-report-editor-after-Upda.patch (text/plain), 2.23 KB, created by Julian Maurice on 2024-09-06 09:06:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julian Maurice

Created: 2024-09-06 09:06:09 UTC

Size: 2.23 KB

patch

obsolete

>From f73e8702406c722cdcd5acc5dda53726c770c68a Mon Sep 17 00:00:00 2001
>From: CJ Lynce <cj.lynce@westlakelibrary.org>
>Date: Wed, 28 Aug 2024 18:45:24 +0000
>Subject: [PATCH] Bug 37763: Do not show SQL report editor after 'Update and
> run'
>
>This patch corrects an error where the SQL editor screen would appear
>after the report results when using 'Update and run SQL' when editing
>reports.
>This also corrects a related issue where the saved_sql.id of the report
>would be repeatedly appended to SQL code when using 'Update and run
>SQL'.
>
>To test:
>1) Login to staff client
>2) Navigate to Reports -> Create from SQL
>3) Create a short report (SELECT * FROM items), name it and SAVE it.
>4) On the resulting "Edit SQL report' page, click 'Update and run SQL'
>5) See the report runs, but at the 'Edit SQL report' screen shows at the
>   bottom.
>6) Apply Patch
>7) Return to Reports -> Saved Reports and Edit the report you created.
>8) On "Edit SQL report' page, click 'Update and run SQL'
>9) Verify that the report runs, but the 'Edit SQL report' section is
>   gone.
>
>Sponsored-by: Westlake Porter Public Library
>Signed-off-by: Sam Sowanick <sam.sowanick@corvallisoregon.gov>
>Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
>---
> reports/guided_reports.pl | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
>diff --git a/reports/guided_reports.pl b/reports/guided_reports.pl
>index 236e43c8e5..bd81131ac1 100755
>--- a/reports/guided_reports.pl
>+++ b/reports/guided_reports.pl
>@@ -225,11 +225,15 @@ elsif ( $op eq 'cud-update_sql' || $op eq 'cud-update_and_run_sql' ){
>                     public => $public,
>                     cache_expiry => $cache_expiry,
>                 } );
>+        my $editsql = 1;
>+        if ($op eq 'cud-update_and_run_sql') {
>+            $editsql = 0;
>+        }
>             $template->param(
>                 'save_successful'       => 1,
>                 'reportname'            => $reportname,
>                 'id'                    => $id,
>-                'editsql'               => 1,
>+                'editsql'               => $editsql,
>                 'sql'                   => $sql,
>                 'groups_with_subgroups' => groups_with_subgroups($group, $subgroup),
>                 'notes'                 => $notes,
>-- 
>2.39.2

Actions: View | Diff | Splinter Review

Attachments on bug 37763: 170839 | 171039 | 171130 | 171131