From 987874f4d866aa89e1cc34062f4bd2b001c52b46 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Fri, 4 Mar 2016 08:27:43 -0500
Subject: [PATCH] Bug 15978: Use Font Awesome icons for guided reports error
 dialog

If you try to save an SQL report with an invalid authorized value
placeholder you will be presented with a confirmation dialog. This patch
updates it to use Font Awesome icons.

Also fixed: Validation error found in testing: Duplicated <form> tag and
series of redundant inputs. Each input cut had an exact duplicate in the
same form.

To test, apply the patch and go to Reports -> Create from SQL.

- Create a new SQL report and fill in as many fields as possible to
  verify correct operation.
- Try to save your report with an invalid authorized value
  placeholder, for example: SELECT * FROM items WHERE items.itype =
  <<foo|bar>>
- Confirm that the confirmation dialog is styled correctly.
- Test the operation of the "Edit SQL" button. You should be sent back a
  page.
- Test the operation of the "Save anyway" button and confirm that your
  report was saved.
- Repeat these steps when editing an existing report.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as described

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
---
 .../modules/reports/guided_reports_start.tt   | 80 ++++++++-----------
 1 file changed, 33 insertions(+), 47 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 1655d92685..d766381977 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
@@ -702,54 +702,40 @@ canned reports and writing custom SQL reports.</p>
 [% END %]
 
 [% IF ( warn_authval_problem ) %]
-     <form action='/cgi-bin/koha/reports/guided_reports.pl'>
+    <div class="dialog alert">
+        <h3>Errors found when processing parameters for report: [% name %]</h3>
+        [% FOREACH problematic_authval IN problematic_authvals %]
+            <p>
+            <strong>[% problematic_authval.name %]:</strong> The authorized value category (<strong>[% problematic_authval.authval %]</strong>)
+                you selected does not exist.
+            </p>
+        [% END %]
+        <!-- Save Anyway Form -->
+        <form action='/cgi-bin/koha/reports/guided_reports.pl'>
         <!--Every parameter the user issued is provided as a hidden field for recovery-->
-        <input type='hidden' name='id' value='[% id %]' />
-        <input type='hidden' name='sql' value='[% sql %]' />
-        <input type='hidden' name='reportname' value='[% reportname %]' />
-        <input type='hidden' name='group' value='[% group %]' />
-        <input type='hidden' name='subgroup' value='[% subgroup %]' />
-        <input type='hidden' name='notes' value='[% notes %]' />
-        <input type='hidden' name='cache_expiry' value='[% cache_expiry %]' />
-        <input type='hidden' name='cache_expiry_units' value='[% cache_expiry_units %]' />
-        <input type='hidden' name='public' value='[% public %]' />
-
-        <div class="dialog alert">
-            <h3>Errors found when processing parameters for report: [% name %]</h3>
-            [% FOREACH problematic_authval IN problematic_authvals %]
-                <p>
-                <strong>[% problematic_authval.name %]:</strong> The authorized value category (<strong>[% problematic_authval.authval %]</strong>)
-                    you selected does not exist.
-                </p>
-            [% END %]
-            <!-- Save Anyway Form -->
-            <form action='/cgi-bin/koha/reports/guided_reports.pl'>
-            <!--Every parameter the user issued is provided as a hidden field for recovery-->
-                <input type='hidden' name='id' value='[% id %]' />
-                <input type='hidden' name='sql' value='[% sql %]' />
-                <input type='hidden' name='reportname' value='[% reportname %]' />
-                <input type='hidden' name='group' value='[% group %]' />
-                <input type='hidden' name='subgroup' value='[% subgroup %]' />
-                <input type='hidden' name='notes' value='[% notes %]' />
-                <input type='hidden' name='cache_expiry' value='[% cache_expiry %]' />
-                <input type='hidden' name='cache_expiry_units' value='[% cache_expiry_units %]' />
-                <input type='hidden' name='public' value='[% public %]' />
-            [% IF ( phase_update) %]
-                <input type='hidden' name='phase' value='Update SQL' />
-                <input type="submit" name="save_anyway" class="approve" value="Save anyway" />
-            [% ELSIF ( phase_save) %]
-                <input type='hidden' name='area' value='[% area %]' />
-                <input type='hidden' name='phase' value='Save Report' />
-                <input type="submit" name="save_anyway" class="approve" value="Save anyway" />
-            [% END %]
-            </form>
-            <!-- Go back to editing -->
-            <form action='/cgi-bin/koha/reports/guided_reports.pl'>
-                <input type="button" name='back' class="deny" value="Edit SQL"
-                                    onclick="javascript:history.back()" />
-            </form>
-        </div>
-    </form>
+            <input type='hidden' name='id' value='[% id %]' />
+            <input type='hidden' name='sql' value='[% sql %]' />
+            <input type='hidden' name='reportname' value='[% reportname %]' />
+            <input type='hidden' name='group' value='[% group %]' />
+            <input type='hidden' name='subgroup' value='[% subgroup %]' />
+            <input type='hidden' name='notes' value='[% notes %]' />
+            <input type='hidden' name='cache_expiry' value='[% cache_expiry %]' />
+            <input type='hidden' name='cache_expiry_units' value='[% cache_expiry_units %]' />
+            <input type='hidden' name='public' value='[% public %]' />
+        [% IF ( phase_update) %]
+            <input type='hidden' name='phase' value='Update SQL' />
+            <button type="submit" name="save_anyway" value="Save anyway" class="approve"><i class="fa fa-fw fa-check"></i> Save anyway</button>
+        [% ELSIF ( phase_save) %]
+            <input type='hidden' name='area' value='[% area %]' />
+            <input type='hidden' name='phase' value='Save Report' />
+            <button type="submit" name="save_anyway" value="Save anyway" class="approve"><i class="fa fa-fw fa-check"></i> Save anyway</button>
+        [% END %]
+        </form>
+        <!-- Go back to editing -->
+        <form action='/cgi-bin/koha/reports/guided_reports.pl'>
+            <button type="button" class="new" onclick="history.back()"><i class="fa fa-fw fa-pencil"></i> Edit SQL</button>
+        </form>
+    </div>
 [% END %]
 
 [% IF ( enter_params ) %]
-- 
2.39.5