Attachment 170839 Details for Bug 37763 – Bug 37763: SQL reports Update and run SQL inappropriately appends the editor screen after the ran report.

[patch] Bug 37763: SQL reports Update and run SQL inappropriately appends the editor screen after the ran report.

Bug-37763-SQL-reports-Update-and-run-SQL-inappropr.patch (text/plain), 2.15 KB, created by CJ Lynce on 2024-08-28 18:47:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: CJ Lynce

Created: 2024-08-28 18:47:35 UTC

Size: 2.15 KB

patch

obsolete

>From c19df605b61dc26682be7fe8a0434bd2819d8086 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: SQL reports Update and run SQL inappropriately
> appends the editor screen after the ran report.
>
>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
>---
> 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..57c2a04167 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