[open-ils-commits] [GIT] Evergreen ILS branch master updated. 828b202a99b5cc97fcea53a0409f298acc3bd546

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  828b202a99b5cc97fcea53a0409f298acc3bd546 (commit)
      from  10114e3aeb26341f3441ebff6e3a102b2fcc1ea5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 828b202a99b5cc97fcea53a0409f298acc3bd546
Author: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Date:   Wed Jan 2 12:33:36 2013 -0500

    LP #1092921: Display of/sorting by CN affixes in Simplified Hold Pull List
    
    In the Simplified Hold Pull List interface, the "Call Number Label" column
    displays the call number of the copy targeted by the hold in each row,
    and it does so by combining affixes with the actual label field.
    Sorting of this column actually uses the call number sortkey generated
    in-database for this purpose.
    
    Sometimes this means that sorting order doesn't match what you'd
    expect to see with this column.  Opinions differ on desired behavior, so
    now you can explicity add columns to the table for call number prefix
    and suffix, and sort on either of those (potentially in combination with
    other columns).
    
    Amended from an earlier version of this commit that still didn't sort
    CN prefix and suffix columns quite right.
    
    Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/src/templates/circ/hold_pull_list.tt2 b/Open-ILS/src/templates/circ/hold_pull_list.tt2
index 67056a8..0b744df 100644
--- a/Open-ILS/src/templates/circ/hold_pull_list.tt2
+++ b/Open-ILS/src/templates/circ/hold_pull_list.tt2
@@ -14,9 +14,17 @@
             "path": "current_copy.circ_lib",
             "filter": true
         },
+        "call_number_prefix_sort_key": {
+            "path": "current_copy.call_number.prefix.label_sortkey",
+            "sort": true
+        },
+        "call_number_suffix_sort_key": {
+            "path": "current_copy.call_number.suffix.label_sortkey",
+            "sort": true
+        },
         "call_number_sort_key": {
             "path": "current_copy.call_number.label_sortkey",
-            "sort" :true
+            "sort": true
         }
     };
 
@@ -84,7 +92,7 @@
         defaultSort="['copy_location_order_position','call_number_sort_key']"
         mapExtras="map_extras"
         suppressFilterFields="['copy_circ_lib']"
-        sortFieldReMap="{call_number_label:'call_number_sort_key',shelving_loc:'copy_location_order_position'}"
+        sortFieldReMap="{call_number_label:'call_number_sort_key',cn_prefix:'call_number_prefix_sort_key',cn_suffix:'call_number_suffix_sort_key',shelving_loc:'copy_location_order_position'}"
         fetchLock="true"
         query="{}">
         <thead>
@@ -104,6 +112,8 @@
                 <th field="request_lib_shortname" fpath="request_lib.shortname" _visible="false" ffilter="true">[% l('Request Library (Shortname)') %]</th>
                 <th field="selection_ou" fpath="selection_ou.shortname" _visible="false" ffilter="true">[% l('Selection Locus') %]</th>
                 <th field="sms_carrier_name" fpath="sms_carrier.name" _visible="false" ffilter="true">[% l('SMS Carrier') %]</th>
+                <th field="cn_prefix" fpath="current_copy.call_number.prefix.label" _visible="false" ffilter="true" fsort="true">[% l('Call Number Prefix') %]</th>
+                <th field="cn_suffix" fpath="current_copy.call_number.suffix.label" _visible="false" ffilter="true" fsort="true">[% l('Call Number Suffix') %]</th>
             </tr>
         </thead>
     </table>

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/templates/circ/hold_pull_list.tt2 |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS