[open-ils-commits] [GIT] Evergreen ILS branch rel_2_4 updated. d52d73fa235a5a1825d146ae9ba68a55b0b0eba2

[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, rel_2_4 has been updated
       via  d52d73fa235a5a1825d146ae9ba68a55b0b0eba2 (commit)
      from  0d96d11d9651fbcabf33d8791ebba18c117aa4b5 (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 d52d73fa235a5a1825d146ae9ba68a55b0b0eba2
Author: Mark Cooper <markchristophercooper at gmail.com>
Date:   Mon Mar 18 15:45:14 2013 -0700

    LP1156905 lineitem worksheet sorts copies by org
    
    Lineitem copies (details) were set to be sorted by branch ('owning_lib')
    by default. However this was not happening because the lineitem_details
    'owning_lib' referenced a fieldmapper object (not an id or name).
    This submission sets the owning_lib to the shortname so that sorting can
    occur in the intended way.
    
    Signed-off-by: Mark Cooper <markchristophercooper at gmail.com>
    Signed-off-by: Bill Erickson <berick at esilibrary.com>

diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
index c6bd274..8b6a290 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -7952,6 +7952,11 @@ $$
             </tr>
         </thead>
         <tbody>
+        <!-- set detail.owning_lib from fm object to org name -->
+        [% FOREACH detail IN li.lineitem_details %]
+            [% detail.owning_lib = detail.owning_lib.shortname %]
+        [% END %]
+
         [% FOREACH detail IN li.lineitem_details.sort('owning_lib') %]
             [% 
                 IF detail.eg_copy_id;
@@ -7964,7 +7969,7 @@ $$
             %]
             <tr>
                 <!-- acq.lineitem_detail.id = [%- detail.id -%] -->
-                <td style='padding:5px;'>[% detail.owning_lib.shortname %]</td>
+                <td style='padding:5px;'>[% detail.owning_lib %]</td>
                 <td style='padding:5px;'>[% IF copy.barcode   %]<span class="barcode"  >[% detail.barcode   %]</span>[% END %]</td>
                 <td style='padding:5px;'>[% IF cn_label %]<span class="cn_label" >[% cn_label  %]</span>[% END %]</td>
                 <td style='padding:5px;'>[% IF detail.fund %]<span class="fund">[% detail.fund.code %] ([% detail.fund.year %])</span>[% END %]</td>

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

Summary of changes:
 Open-ILS/src/sql/Pg/950.data.seed-values.sql |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS