Attachment 48689 Details for Bug 15978 – Bug 15978 - Use Font Awesome icons for guided reports error dialog

[patch] Bug 15978 - Use Font Awesome icons for guided reports error dialog

Bug-15978---Use-Font-Awesome-icons-for-guided-repo.patch (text/plain), 6.77 KB, created by Owen Leonard on 2016-03-04 13:49:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2016-03-04 13:49:19 UTC

Size: 6.77 KB

patch

obsolete

>From 694e2ed141e48e5e6a949445989f4c2a0194f5b3 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
>Content-Type: text/plain; charset="utf-8"
>
>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.
>---
> .../en/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 1655d92..d766381 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 %]
>+        
>+        <form action='/cgi-bin/koha/reports/guided_reports.pl'>
>         
>-        <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 %]
>-            
>-            <form action='/cgi-bin/koha/reports/guided_reports.pl'>
>-            
>-                <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>
>-            
>-            <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>
>+        
>+        <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.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 15978: 48689 | 48691 | 48942