Attachment 39493 Details for Bug 14268 – Bug 14268: counter-patch -- dropdown for Variable type

[patch] Bug 14268: counter-patch -- dropdown for Variable type

Bug-14268-counter-patch----dropdown-for-Variable-t.patch (text/plain), 4.89 KB, created by Mark Tompsett on 2015-05-25 19:47:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Tompsett

Created: 2015-05-25 19:47:07 UTC

Size: 4.89 KB

patch

obsolete

>From f31af738103d0fd80686b936b0041e15a2cc85b7 Mon Sep 17 00:00:00 2001
>From: Mark Tompsett <mtompset@hotmail.com>
>Date: Mon, 25 May 2015 15:38:36 -0400
>Subject: [PATCH] Bug 14268: counter-patch -- dropdown for Variable type
>
>The information needed to build the dropdown is already passed.
>This patch uses it to build the variable type dropdown correctly.
>
>TEST PLAN
>---------
> 1) Apply 14135
> 2) In the staff client:
>     Home -> Global system preferences -> Local use
> 3) Click 'Edit' on any system preference.
> 4) Note all the types listed.
> 5) Click 'Cancel'
> 6) Apply this patch
> 7) Click '+New Preference'
> 8) Enter data to have a decent 'Free' type preference.
> 9) Click 'Save'
>10) For each type noted in step 4 (do 'Free' again last)
>    a) Click 'Edit' for the added system preference
>       -- it should be the last saved variable type.
>    b) Change the variable type to the next type.
>    c) Click 'Save'
>    d) Repeat steps (a) through (c) until all the types have
>       been done.
>    -- NOTE: Yes, there are other strange things here, but
>             those are beyond the scope of this bug.
>11) Run koha qa test tools
>---
> .../prog/en/modules/admin/systempreferences.tt     | 54 +++++++++++++++++++++-
> 1 file changed, 52 insertions(+), 2 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
>index e699041..ddfee8a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
>@@ -200,8 +200,58 @@
>         <div class="hint">Note: you should have no reasons to modify the following default values</div>
>         <ol>
>         <li><label for="preftype">Variable type:</label>
>-        <div class="hint"> (<span class="variabletype" id="Free">Free</span>, <span class="variabletype" id="Choice">Choice</span>, <span class="variabletype" id="YesNo">YesNo</span>, <span class="variabletype" id="Integer">Integer</span>, <span class="variabletype" id="Textarea">Textarea</span>, <span class="variabletype" id="Float">Float</span>, <span class="variabletype" id="Themes">Themes</span>, <span class="variabletype" id="Languages">Languages</span>, <span class="variabletype" id="Upload">Upload</span> or <span class="variabletype" id="ClassSources">ClassSources</span>)</div>
>-        <input type="text" name="preftype" id="preftype" value="[% preftype %]" size="40" maxlength="40" /></li>
>+        <select name="preftype" id="preftype">
>+        [%- IF (preftype && preftype == 'Free') || !preftype -%]
>+            <option value="Free" selected>Free</option>
>+        [%- ELSE -%]
>+            <option value="Free">Free</option>
>+        [% END %]
>+        [%- IF (preftype && preftype == 'Choice') -%]
>+            <option value="Choice" selected>Choice</option>
>+        [%- ELSE -%]
>+            <option value="Choice">Choice</option>
>+        [% END %]
>+        [%- IF (preftype && preftype == 'YesNo') -%]
>+            <option value="YesNo" selected>YesNo</option>
>+        [%- ELSE -%]
>+            <option value="YesNo">YesNo</option>
>+        [% END %]
>+        [%- IF (preftype && preftype == 'Integer') -%]
>+            <option value="Integer" selected>Integer</option>
>+        [%- ELSE -%]
>+            <option value="Integer">Integer</option>
>+        [% END %]
>+        [%- IF (preftype && preftype == 'Textarea') -%]
>+            <option value="Textarea" selected>Textarea</option>
>+        [%- ELSE -%]
>+            <option value="Textarea">Textarea</option>
>+        [% END %]
>+        [%- IF (preftype && preftype == 'Float') -%]
>+            <option value="Float" selected>Float</option>
>+        [%- ELSE -%]
>+            <option value="Float">Float</option>
>+        [% END %]
>+        [%- IF (preftype && preftype == 'Themes') -%]
>+            <option value="Themes" selected>Themes</option>
>+        [%- ELSE -%]
>+            <option value="Themes">Themes</option>
>+        [% END %]
>+        [%- IF (preftype && preftype == 'Languages') -%]
>+            <option value="Languages" selected>Languages</option>
>+        [%- ELSE -%]
>+            <option value="Languages">Languages</option>
>+        [% END %]
>+        [%- IF (preftype && preftype == 'Upload') -%]
>+            <option value="Upload" selected>Upload</option>
>+        [%- ELSE -%]
>+            <option value="Upload">Upload</option>
>+        [% END %]
>+        [%- IF (preftype && preftype == 'ClassSources') -%]
>+            <option value="ClassSources" selected>ClassSources</option>
>+        [%- ELSE -%]
>+            <option value="ClassSources">ClassSources</option>
>+        [% END %]
>+        </select>
>         <li><label for="prefoptions">Variable options:</label>
>         <div class="hint">(a choice list for choice (separated by |) or cols|rows for texarea)</div>
>         <input type="text" name="prefoptions" id="prefoptions" value="[% prefoptions %]" size="60" maxlength="80" /></li>
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 14268: 39484 | 39493 | 39494 | 39495 | 39496 | 39580 | 39581 | 39589 | 39590