Attachment 44115 Details for Bug 9223 – Bug 9223 [Follow-up] Multiple values of AdvancedSearchTypes in suggestions

[patch] Bug 9223 [Follow-up] Multiple values of AdvancedSearchTypes in suggestions

Bug-9223-Follow-up-Multiple-values-of-AdvancedSear.patch (text/plain), 15.07 KB, created by Alex Arnaud on 2015-10-28 09:59:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Arnaud

Created: 2015-10-28 09:59:44 UTC

Size: 15.07 KB

patch

obsolete

>From d2299231d1fe1dab20396bf62fbb6a1aa24e4114 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Wed, 31 Jul 2013 12:33:32 -0400
>Subject: [PATCH] Bug 9223 [Follow-up] Multiple values of AdvancedSearchTypes
> in suggestions
>
>This follow-up implements some things I think will improve on the
>previous patches:
>
>- Change the system preference name to "SuggestionsUseValues"
>- Change the description of the preference to "Suggestions can be
>  submitted using the following authorized values:"
>- Move the new preference to the OPAC tab so that it is grouped with
>  other suggestions-related preferences.
>- Add the option offer no itemtype/collection code chooser on the
>  submission form.
>- Display the correct label on the submission form depending on the
>  value of the SuggestionsUseValues preference.
>
>To test, apply this patch on top of the previous ones. Test submission
>of purchase suggestions through the OPAC and staff client with the
>SuggestionsUseValues preference set to all the various choices: item
>type, collection code, shelving location, and 'none.' The suggestion
>forms should look correct and work correctly.
>
>HOWEVER, neither the previous patches nor mine address the problem of
>the suggestions management page's "organize by" option, which is
>hard-coded to work with item types. Whether or not my patch is
>acceptable this issue will need to be addressed.
>
>Signed-off-by: Olli-Antti Kivilahti <olli-antti.kivilahti@jns.fi>
>
>  Tested the TEST PLAN. With ccode, itype, none, loc.
>  On both OPAC and SC.
>  Making a code review, but it is hard during the hackfest.
>  Morbid lack of any kind of unit test!
>---
> C4/Koha.pm                                         |    4 +-
> installer/data/mysql/sysprefs.sql                  |    2 +-
> installer/data/mysql/updatedatabase.pl             |    4 +-
> .../en/modules/admin/preferences/cataloguing.pref  |    9 ----
> .../prog/en/modules/admin/preferences/opac.pref    |    9 ++++
> .../prog/en/modules/suggestion/suggestion.tt       |   47 ++++++++++++++------
> .../bootstrap/en/modules/opac-suggestions.tt       |   17 +++++--
> 7 files changed, 61 insertions(+), 31 deletions(-)
>
>diff --git a/C4/Koha.pm b/C4/Koha.pm
>index cfb9ebb..fe07a95 100644
>--- a/C4/Koha.pm
>+++ b/C4/Koha.pm
>@@ -140,7 +140,7 @@ Returns the name of the support corresponding to specified authorised value.
> sub GetSupportName {
>     my $authorised_value = shift;
>     return '' unless $authorised_value;
>-    my $supports_av = C4::Context->preference("SupportsAuthorizedValues") || 'itemtypes';
>+    my $supports_av = C4::Context->preference("SuggestionsUseValues") || 'itemtypes';
>     if ( $supports_av eq 'itemtypes' ) {
>         my $itemtype = getitemtypeinfo($authorised_value);
>         return $itemtype->{'description'} if $itemtype;
>@@ -180,7 +180,7 @@ build a HTML select with the following code :
> =cut
> 
> sub GetSupportList {
>-    my $supports_av = C4::Context->preference("SupportsAuthorizedValues") || 'itemtypes';
>+    my $supports_av = C4::Context->preference("SuggestionsUseValues") || 'itemtypes';
>     if ( $supports_av eq 'itemtypes' ) {
>         my @supports = map {
>             {
>diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
>index 474b2de..4617dd3 100644
>--- a/installer/data/mysql/sysprefs.sql
>+++ b/installer/data/mysql/sysprefs.sql
>@@ -429,7 +429,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
> ('SubscriptionHistory','simplified','simplified|full','Define the display preference for serials issue history in OPAC','Choice'),
> ('SubscriptionLog','1',NULL,'If ON, enables subscriptions log','YesNo'),
> ('suggestion','1','','If ON, enables patron suggestions feature in OPAC','YesNo'),
>-('SupportsAuthorizedValues','itemtypes','itemtypes|ccode|loc','Authorized values representing document physical support','Choice'),
>+('SuggestionsUseValues','itemtypes','itemtypes|ccode|loc|none','Suggestions can be submitted using the following authorized values:','Choice'),
> ('SuspendHoldsIntranet','1','Allow holds to be suspended from the intranet.',NULL,'YesNo'),
> ('SuspendHoldsOpac','1','Allow holds to be suspended from the OPAC.',NULL,'YesNo'),
> ('SvcMaxReportRows','10',NULL,'Maximum number of rows to return via the report web service.','Integer'),
>diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
>index 02e1c94..936270a 100755
>--- a/installer/data/mysql/updatedatabase.pl
>+++ b/installer/data/mysql/updatedatabase.pl
>@@ -11239,8 +11239,8 @@ if ( CheckVersion($DBversion) ) {
> 
> $DBversion = "3.19.00.XXX";
> if ( CheckVersion($DBversion) ) {
>-   $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('SupportsAuthorizedValues', 'itemtypes', 'Authorized values representing document physical support','itemtypes|ccode|loc','Choice')");
>-   print "Upgrade to $DBversion done (Bug 9223: Add SupportsAuthorizedValues syspref)\n";
>+   $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('SuggestionsUseValues', 'itemtypes', 'Suggestions can be submitted using the following authorized values:','itemtypes|ccode|loc|none','Choice')");
>+   print "Upgrade to $DBversion done (Bug 9223: Add SuggestionsUseValues syspref)\n";
>    SetVersion ($DBversion);
> }
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
>index 91a694c..703e17c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
>@@ -125,15 +125,6 @@ Cataloging:
>             - 'MARC21: "952$a 952$b 952$c"'
>             - Note that the FA framework is excluded from the permission.
>             - If the pref is empty, no fields are restricted.
>-        -
>-            - pref: SupportsAuthorizedValues
>-              default: itemtypes
>-              choices:
>-                  itemtypes: "Item type"
>-                  loc: "Shelving Location"
>-                  ccode: "Collection code"
>-            - represents document physical support.
>-        -
>     Display:
>         -
>             - 'Separate multiple displayed authors, series or subjects with '
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
>index 17d0b1a..2ab6cb5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
>@@ -536,6 +536,15 @@ OPAC:
>                   yes: Allow
>             - patrons to select library when making a purchase suggestion
>         -
>+            - 'Suggestions can be submitted using the following authorized values:'
>+            - pref: SuggestionsUseValues
>+              default: itemtypes
>+              choices:
>+                  itemtypes: "Item type"
>+                  loc: "Shelving location"
>+                  ccode: "Collection code"
>+                  none: "None. Hide this option"
>+        -
>             - pref: OpacHiddenItems
>               type: textarea
>               class: code
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
>index 60a58b3..497e01a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
>@@ -1,3 +1,4 @@
>+[% USE Koha %]
> [% USE Branches %]
> [% USE AuthorisedValues %]
> [% USE KohaDates %]
>@@ -212,11 +213,21 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o
>         <li><span class="label">Publisher:</span>[% publishercode |html %]</li>
>         <li><span class="label">Publication place:</span>[% place |html %]</li>
>         <li><span class="label">Collection title:</span>[% collectiontitle |html %]</li>
>-        <li><span class="label">Document type:</span>
>-            [% FOREACH supports_loo IN supports_loop %]
>-                [% IF ( supports_loo.selected ) %][% supports_loo.lib %][% END %]
>-            [% END %]
>-        </li>
>+        [% IF ( Koha.Preference( 'SuggestionsUseValues' ) != 'none' ) %]
>+            <li>
>+                [% IF ( Koha.Preference( 'SuggestionsUseValues' ) == 'itemtypes' ) %]
>+                    <span class="label">Item type:</span>
>+                [% ELSIF ( Koha.Preference( 'SuggestionsUseValues' ) == 'ccode' ) %]
>+                    <span class="label">Collection:</span>
>+                [% ELSIF ( Koha.Preference( 'SuggestionsUseValues' ) == 'loc' )%]
>+                    <span class="label">Shelving location:</span>
>+                [% END %]
>+                [% FOREACH supports_loo IN supports_loop %]
>+                    [% IF ( supports_loo.selected ) %][% supports_loo.lib %][% END %]
>+                [% END %]
>+            </li>
>+        [% END %]
>+
>         [% IF ( patron_reason_loop ) %]
>           <li><span class="label">Reason for suggestion: </span>
>             [% FOREACH patron_reason_loo IN patron_reason_loop %]
>@@ -335,14 +346,24 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o
>         <li><label for="publishercode">Publisher:</label><input type="text" id="publishercode" name="publishercode" size="50" maxlength="80" value="[% publishercode | html %]"/></li>
>         <li><label for="place">Publication place:</label><input type="text" id="place" name="place" size="50" maxlength="80" value="[% place | html %]"/></li>
>         <li><label for="collectiontitle">Collection title:</label><input type="text" id="collectiontitle" name="collectiontitle" size="50" maxlength="80" value="[% collectiontitle | html %]"/></li>
>-        <li><label for="itemtype">Document type:</label>
>-            <select id="itemtype" name="itemtype" >
>-            [% FOREACH supports_loo IN supports_loop %]
>-                [% IF ( supports_loo.selected ) %]<option selected="selected" value="[% supports_loo.authorised_value %]">[% ELSE %]<option value="[% supports_loo.authorised_value %]">[% END %]
>-                [% supports_loo.lib %]</option>
>-            [% END %]
>-            </select>
>-        </li>
>+        [% IF ( Koha.Preference( 'SuggestionsUseValues' ) != 'none' ) %]
>+            <li>
>+                [% IF ( Koha.Preference( 'SuggestionsUseValues' ) == 'itemtypes' ) %]
>+                    <label for="itemtype">Item type:</label>
>+                [% ELSIF ( Koha.Preference( 'SuggestionsUseValues' ) == 'ccode' ) %]
>+                    <label for="itemtype">Collection:</label>
>+                [% ELSIF ( Koha.Preference( 'SuggestionsUseValues' ) == 'loc' )%]
>+                    <label for="itemtype">Shelving location:</label>
>+                [% END %]
>+                <select id="itemtype" name="itemtype" >
>+                    <option value=""></option>
>+                    [% FOREACH supports_loo IN supports_loop %]
>+                        [% IF ( supports_loo.selected ) %]<option selected="selected" value="[% supports_loo.authorised_value %]">[% ELSE %]<option value="[% supports_loo.authorised_value %]">[% END %]
>+                        [% supports_loo.lib %]</option>
>+                    [% END %]
>+                </select>
>+            </li>
>+        [% END %]
>         [% IF ( patron_reason_loop ) %]<li><label for="patronreason">Reason for suggestion: </label><select name="patronreason" id="patronreason"><option value=""> -- Choose -- </option>[% FOREACH patron_reason_loo IN patron_reason_loop %]
>                 [% IF ( patron_reason_loo.selected ) %]<option value="[% patron_reason_loo.authorised_value %]" selected="selected">[% patron_reason_loo.lib %]</option>[% ELSE %]<option value="[% patron_reason_loo.authorised_value %]">[% patron_reason_loo.lib %]</option>[% END %]
>            [% END %]</select></li>[% END %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
>index cb3df83..cf5eed4 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
>@@ -42,20 +42,29 @@
>                                         <li><label for="publishercode">Publisher:</label><input type="text" id="publishercode" name="publishercode" class="span6" maxlength="80" /></li>
>                                         <li><label for="collectiontitle">Collection title:</label><input type="text" id="collectiontitle" name="collectiontitle" class="span6" maxlength="80" /></li>
>                                         <li><label for="place">Publication place:</label><input type="text" id="place" name="place"  maxlength="80" /></li>
>-                                        <li><label for="itemtype">Document type:</label>
>+                                        [% IF ( Koha.Preference( 'SuggestionsUseValues' ) != 'none' ) %]
>+                                            <li>
>+                                                [% IF ( Koha.Preference( 'SuggestionsUseValues' ) == 'itemtypes' ) %]
>+                                                    <label for="itemtype">Item type:</label>
>+                                                [% ELSIF ( Koha.Preference( 'SuggestionsUseValues' ) == 'ccode' ) %]
>+                                                    <label for="itemtype">Collection:</label>
>+                                                [% ELSIF ( Koha.Preference( 'SuggestionsUseValues' ) == 'loc' )%]
>+                                                    <label for="itemtype">Shelving location:</label>
>+                                                [% END %]
>                                             <select name="itemtype" id="itemtype">
>                                                 <option value="">Default</option>
>                                                 [% FOREACH supports_loo IN supports_loop %]
>                                                     [% IF ( supports_loo.selected ) %]
>-                                                        <option value="[% supports_loo.itemtype %]" selected="selected">
>+                                                        <option value="[% supports_loo.authorised_value %]" selected="selected">
>                                                     [% ELSE %]
>-                                                        <option value="[% supports_loo.itemtype %]">
>+                                                        <option value="[% supports_loo.authorised_value %]">
>                                                     [% END %]
>-                                                            [% supports_loo.description %]
>+                                                            [% supports_loo.lib %]
>                                                         </option>
>                                                 [% END %]
>                                             </select>
>                                         </li>
>+                                        [% END %]
>                                         [% IF ( branchloop ) %]
>                                             <li><label for="branch">Library:</label>
>                                                 <select name="branchcode" id="branch">
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 9223: 13903 | 14427 | 14428 | 20015 | 20016 | 20017 | 35492 | 35493 | 35494 | 36178 | 36179 | 36702 | 36703 | 36704 | 40011 | 40012 | 40013 | 40014 | 40015 | 40016 | 42287 | 42288 | 42289 | 42290 | 42291 | 42336 | 42337 | 42338 | 42339 | 42340 | 44111 | 44113 | 44114 | 44115 | 44116 | 44117 | 44118