Attachment 123109 Details for Bug 27747 – Bug 27747: (QA follow-up) Make code consistent and add explicit brackets

[patch] Bug 27747: (QA follow-up) Make code consistent and add explicit brackets

Bug-27747-QA-follow-up-Make-code-consistent-and-ad.patch (text/plain), 2.30 KB, created by Nick Clemens (kidclamp) on 2021-07-23 13:07:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Clemens (kidclamp)

Created: 2021-07-23 13:07:59 UTC

Size: 2.30 KB

patch

obsolete

>From 51b053b2b2f452da3bac4d6ff2211174fb56e362 Mon Sep 17 00:00:00 2001
>From: Nick Clemens <nick@bywatersolutions.com>
>Date: Fri, 23 Jul 2021 13:05:41 +0000
>Subject: [PATCH] Bug 27747: (QA follow-up) Make code consistent and add
> explicit brackets
>
>The while statements were including the next statement, I add brackets to make it
>more obvious
>
>Also the highlighting was applying to [[borrowernumber|Borrow number]
>I removed the break to match code above and only highlight when syntax complete and correct
>
>Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
>---
> .../modules/reports/guided_reports_start.tt   | 19 +++++++++++--------
> 1 file changed, 11 insertions(+), 8 deletions(-)
>
>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 11cfc366ee..4afd8b7179 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
>@@ -1429,18 +1429,21 @@
>                     var ch;
> 
>                     if (stream.match("<<")) {
>-                        while ((ch = stream.next()) != null)
>-                        if (ch == ">" && stream.next() == ">") {
>-                            stream.eat(">");
>-                            return "sqlParams";
>+                        while ((ch = stream.next()) != null) {
>+                            if (ch == ">" && stream.next() == ">") {
>+                                stream.eat(">");
>+                                return "sqlParams";
>+                            }
>                         }
>                     }
> 
>                     if (stream.match("[[")) {
>-                        while ((ch = stream.next()) != null)
>-                            if (ch == "]" && stream.next() == "]") break;
>-                        stream.eat("]");
>-                        return "columnPlaceholder";
>+                        while ((ch = stream.next()) != null) {
>+                            if (ch == "]" && stream.next() == "]") {
>+                                stream.eat("]");
>+                                return "columnPlaceholder";
>+                            }
>+                        }
>                     }
> 
>                     else if (stream.next() != null) {
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 27747: 117146 | 120849 | 123108 | 123109