Attachment 57994 Details for Bug 17718 – Bug 17718: Fixed QA tool complains

[patch] Bug 17718: Fixed QA tool complains

Bug-17718-Fixed-QA-tool-complains.patch (text/plain), 13.53 KB, created by Radek Šiman (R-Bit Technology, s.r.o.) on 2016-12-06 08:40:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Radek Šiman (R-Bit Technology, s.r.o.)

Created: 2016-12-06 08:40:12 UTC

Size: 13.53 KB

patch

obsolete

>From 20031cace77b45cba4a1cce5ff92241e430ae3da Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Radek=20=C5=A0iman?= <rbit@rbit.cz>
>Date: Mon, 5 Dec 2016 16:04:33 +0100
>Subject: [PATCH] Bug 17718: Fixed QA tool complains
>
>I don't fully understand the reason, but I had run the tool without any
>errors. Now I did my best according to coding guidelines, I hope.
>
>Test plan:
>1) Apply the patch
>2) Setup preferences "SmartformEnable", "SmartformClientID"
>   (register at smartform.cz or use "smartform" as the client ID)
>3) Show/hide streetnumber as desired in BorrowerUnwantedField pref
>   (eg. fill in "streetnumber|B_streetnumber")
>4) Edit a patron
>5) Start entering street in an address field
>6) Select a street from autocomplete
>7) Continue entering street number and select the right address
>8) ZIP and city should get values from autocomplete
>9) Disable SmartformEnable and repeat steps above
>10) No autocompletion should occur
>---
> .../en/includes/member-alt-address-style-de.inc    | 46 ++++++++++++++++------
> .../en/includes/member-alt-contact-style-de.inc    | 36 +++++++++++------
> .../en/includes/member-main-address-style-de.inc   | 28 +++++++++++--
> 3 files changed, 81 insertions(+), 29 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-de.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-de.inc
>index 8aa17f4..004193e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-de.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-de.inc
>@@ -9,7 +9,15 @@
>                     <label for="B_address">
>                 [% END %]
>                 Address: </label>
>-                    <input type="text" id="B_address" name="B_address" size="40" value="[% B_address %]"[% IF Koha.Preference('SmartformEnable') %] class="smartform-instance-alt-address smartform-street[% IF ( noB_streetnumber ) %]-and-number[% END %]"[% END %] />
>+                [% IF Koha.Preference('SmartformEnable') %]
>+                    [% IF ( noB_streetnumber ) %]
>+                        <input type="text" id="B_address" name="B_address" size="40" value="[% B_address %]" class="smartform-instance-alt-address smartform-street-and-number" />
>+                    [% ELSE %]
>+                        <input type="text" id="B_address" name="B_address" size="40" value="[% B_address %]" class="smartform-instance-alt-address smartform-street" />
>+                    [% END %]
>+                [% ELSE %]
>+                    <input type="text" id="B_address" name="B_address" size="40" value="[% B_address %]" />
>+                [% END %]
>       [% IF ( mandatoryB_address ) %]<span class="required">Required</span>[% END %]
>             </li>
>         [% END %]
>@@ -44,7 +52,11 @@
>                     <label for="B_streetnumber">
>                 [% END %]
>                 Street Number: </label>
>-                    <input type="text" id="B_streetnumber" name="B_streetnumber" size="5" value="[% B_streetnumber %]"[% IF Koha.Preference('SmartformEnable') %] class="smartform-instance-alt-address smartform-number"[% END %] />
>+                [% IF Koha.Preference('SmartformEnable') %]
>+                    <input type="text" id="B_streetnumber" name="B_streetnumber" size="5" value="[% B_streetnumber %]" class="smartform-instance-alt-address smartform-number" />
>+                [% ELSE %]
>+                    <input type="text" id="B_streetnumber" name="B_streetnumber" size="5" value="[% B_streetnumber %]" />
>+                [% END %]
>                 [% IF ( mandatoryB_streetnumber ) %]<span class="required">Required</span>[% END %]
>             </li>
>         [% END %]
>@@ -62,16 +74,20 @@
>             </li>
>         [% END %]
>         [% UNLESS noB_zipcode %]
>-                        <li>
>-                                [% IF ( mandatoryB_zipcode ) %]
>-                                        <label for="B_zipcode" class="required">
>-                                [% ELSE %]
>-                                        <label for="B_zipcode">
>-                                [% END %]
>-                                ZIP/Postal code: </label>
>-                    <input type="text" id="B_zipcode" name="B_zipcode" maxlength="10" size="10" value="[% B_zipcode %]"[% IF Koha.Preference('SmartformEnable') %] class="smartform-instance-alt-address smartform-zip"[% END %] />
>-          [% IF ( mandatoryB_zipcode ) %]<span class="required">Required</span>[% END %]
>-                        </li>
>+            <li>
>+                [% IF ( mandatoryB_zipcode ) %]
>+                    <label for="B_zipcode" class="required">
>+                [% ELSE %]
>+                    <label for="B_zipcode">
>+                [% END %]
>+                ZIP/Postal code: </label>
>+                [% IF Koha.Preference('SmartformEnable') %]
>+                    <input type="text" id="B_zipcode" name="B_zipcode" maxlength="10" size="10" value="[% B_zipcode %]" class="smartform-instance-alt-address smartform-zip" />
>+                [% ELSE %]
>+                    <input type="text" id="B_zipcode" name="B_zipcode" maxlength="10" size="10" value="[% B_zipcode %]" />
>+                [% END %]
>+                [% IF ( mandatoryB_zipcode ) %]<span class="required">Required</span>[% END %]
>+            </li>
>         [% END %]
>         [% UNLESS noB_city %]
>             <li>
>@@ -81,7 +97,11 @@
>                     <label for="B_city">
>                 [% END %]
>                 City: </label>
>-                <input type="text" id="B_city" name="B_city" size="20" value="[% B_city %]"[% IF Koha.Preference('SmartformEnable') %] class="smartform-instance-alt-address smartform-city"[% END %] />
>+                [% IF Koha.Preference('SmartformEnable') %]
>+                    <input type="text" id="B_city" name="B_city" size="20" value="[% B_city %]" class="smartform-instance-alt-address smartform-city" />
>+                [% ELSE %]
>+                    <input type="text" id="B_city" name="B_city" size="20" value="[% B_city %]" />
>+                [% END %]
>       [% IF ( mandatoryB_city ) %]<span class="required">Required</span>[% END %]
>             </li>
>         [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-de.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-de.inc
>index 36ed944..d1fbb70 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-de.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-de.inc
>@@ -33,7 +33,11 @@
>                 <label for="altcontactaddress1">
>                 [% END %]
>                 Address:</label>
>-                    <input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% altcontactaddress1 %]" size="40"[% IF Koha.Preference('SmartformEnable') %] class="smartform-instance-alt-contact smartform-street-and-number"[% END %] />
>+                [% IF Koha.Preference('SmartformEnable') %]
>+                    <input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% altcontactaddress1 %]" size="40" class="smartform-instance-alt-contact smartform-street-and-number" />
>+                [% ELSE %]
>+                    <input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% altcontactaddress1 %]" size="40" />
>+                [% END %]
>                 [% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">Required</span>[% END %]
>             </li>
>         [% END %]
>@@ -50,16 +54,20 @@
>             </li>
>         [% END %]
>         [% UNLESS noaltcontactzipcode %]
>-                        <li>
>-                            [% IF ( mandatoryaltcontactzipcode ) %]
>-                                <label for="altcontactzipcode" class="required">
>-                                [% ELSE %]
>-                                <label for="altcontactzipcode">
>-                                [% END %]
>-                                ZIP/Postal code:</label>
>-                    <input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% altcontactzipcode %]" size="5"[% IF Koha.Preference('SmartformEnable') %] class="smartform-instance-alt-contact smartform-zip"[% END %] />
>-                                [% IF ( mandatoryaltcontactzipcode ) %]<span class="required">Required</span>[% END %]
>-                        </li>
>+            <li>
>+                [% IF ( mandatoryaltcontactzipcode ) %]
>+                    <label for="altcontactzipcode" class="required">
>+                [% ELSE %]
>+                    <label for="altcontactzipcode">
>+                [% END %]
>+                ZIP/Postal code:</label>
>+                [% IF Koha.Preference('SmartformEnable') %]
>+                    <input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% altcontactzipcode %]" size="5" class="smartform-instance-alt-contact smartform-zip" />
>+                [% ELSE %]
>+                    <input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% altcontactzipcode %]" size="5" />
>+                [% END %]
>+                [% IF ( mandatoryaltcontactzipcode ) %]<span class="required">Required</span>[% END %]
>+            </li>
>         [% END %]
>         [% UNLESS noaltcontactaddress3 %]
>             <li>
>@@ -69,7 +77,11 @@
>                 <label for="altcontactaddress3">
>                 [% END %]
>                 City:</label>
>-                <input type="text" name="altcontactaddress3" id="altcontactaddress3" value="[% altcontactaddress3 %]" size="20"[% IF Koha.Preference('SmartformEnable') %] class="smartform-instance-alt-contact smartform-city"[% END %] />
>+                [% IF Koha.Preference('SmartformEnable') %]
>+                    <input type="text" name="altcontactaddress3" id="altcontactaddress3" value="[% altcontactaddress3 %]" size="20" class="smartform-instance-alt-contact smartform-city" />
>+                [% ELSE %]
>+                    <input type="text" name="altcontactaddress3" id="altcontactaddress3" value="[% altcontactaddress3 %]" size="20" />
>+                [% END %]
>                 [% IF ( mandatoryaltcontactaddress3 ) %]<span class="required">Required</span>[% END %]
>             </li>
>         [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc
>index 27097cf..bb43dc2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc
>@@ -32,7 +32,15 @@
>       <label for="address">
>       [% END %]
>       Address: </label>
>-            <input type="text" id="address" name="address" size="35" value="[% address %]"[% IF Koha.Preference('SmartformEnable') %] class="smartform-instance-main smartform-street[% IF ( nostreetnumber ) %]-and-number[% END %]"[% END %] />
>+      [% IF Koha.Preference('SmartformEnable') %]
>+        [% IF ( nostreetnumber ) %]
>+            <input type="text" id="address" name="address" size="35" value="[% address %]" class="smartform-instance-main smartform-street-and-number" />
>+        [% ELSE %]
>+            <input type="text" id="address" name="address" size="35" value="[% address %]" class="smartform-instance-main smartform-street" />
>+        [% END %]
>+      [% ELSE %]
>+            <input type="text" id="address" name="address" size="35" value="[% address %]" />
>+      [% END %]
>       [% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %]
>     </li>
>         [% END %]
>@@ -44,7 +52,11 @@
>       <label for="streetnumber">
>       [% END %]
>       Street number: </label>
>-        <input type="text" id="streetnumber" name="streetnumber" size="5" value="[% streetnumber %]"[% IF Koha.Preference('SmartformEnable') %] class="smartform-instance-main smartform-number"[% END %] />
>+      [% IF Koha.Preference('SmartformEnable') %]
>+        <input type="text" id="streetnumber" name="streetnumber" size="5" value="[% streetnumber %]" class="smartform-instance-main smartform-number" />
>+      [% ELSE %]
>+        <input type="text" id="streetnumber" name="streetnumber" size="5" value="[% streetnumber %]" />
>+      [% END %]
> [% IF ( mandatorystreetnumber ) %]<span class="required">Required</span>[% END %]
>     </li>
>         [% END %]
>@@ -68,7 +80,11 @@
>         <label for="zipcode">
>       [% END %]
>       ZIP/Postal code: </label>
>-            <input type="text" name="zipcode" id="zipcode" size="10" value="[% zipcode %]"[% IF Koha.Preference('SmartformEnable') %] class="smartform-instance-main smartform-zip"[% END %] />
>+      [% IF Koha.Preference('SmartformEnable') %]
>+            <input type="text" name="zipcode" id="zipcode" size="10" value="[% zipcode %]" class="smartform-instance-main smartform-zip" />
>+      [% ELSE %]
>+            <input type="text" name="zipcode" id="zipcode" size="10" value="[% zipcode %]" />
>+      [% END %]
>           [% IF ( mandatoryzipcode ) %]<span class="required">Required</span>[% END %]
>     </li>
>         [% END %]
>@@ -80,7 +96,11 @@
>         <label for="city">
>       [% END %]
>       City: </label>
>-        <input type="text" id="city" name="city" size="20" value="[% city %]"[% IF Koha.Preference('SmartformEnable') %] class="smartform-instance-main smartform-city"[% END %] />
>+      [% IF Koha.Preference('SmartformEnable') %]
>+        <input type="text" id="city" name="city" size="20" value="[% city %]" class="smartform-instance-main smartform-city" />
>+      [% ELSE %]
>+        <input type="text" id="city" name="city" size="20" value="[% city %]" />
>+      [% END %]
>         [% IF cities.count %]or choose
>         <select id="select_city" name="select_city">
>             <option value="|||"></option>
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 17718: 57948 | 57969 | 57994 | 57995