[open-ils-commits] [GIT] Evergreen ILS branch rel_2_3 updated. fd1edec01fa557f5bef7af7134c666ee33022b47

[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_3 has been updated
       via  fd1edec01fa557f5bef7af7134c666ee33022b47 (commit)
       via  f2637d02138436d0fd38ee2b2a619435a8fc9c9b (commit)
       via  419194ddf821ab675dccbb91f9e887daa1934a4c (commit)
      from  82359534187f32052534bcbd64a1fdef3868c271 (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 fd1edec01fa557f5bef7af7134c666ee33022b47
Author: Melissa Lefebvre <mlefebvre at biblio.org>
Date:   Tue Nov 27 13:35:42 2012 -0500

    KPAC - add shelving location to copy table display
    
    Addition of shelving location information to the display along with the
    removal of broken "view library info" javascript link.
    
    Signed-off-by: Melissa Lefebvre <mlefebvre at biblio.org>
    Signed-off-by: Michael Peters <mrpeters at library.in.gov>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/src/templates/kpac/parts/copy_table.tt2 b/Open-ILS/src/templates/kpac/parts/copy_table.tt2
index 0527f9f..7939987 100644
--- a/Open-ILS/src/templates/kpac/parts/copy_table.tt2
+++ b/Open-ILS/src/templates/kpac/parts/copy_table.tt2
@@ -16,9 +16,9 @@ END;
     <tbody>
         <tr class="header">
             <td class="location">[% l('Location') %]</td>
-            <td class="loc_info">&nbsp;</td>
-            <td class="status">[% l('Status') %]</td>
             <td class="callnumber">[% l('Call Number') %]</td>
+            <td class="shelving_location">[% l('Shelving Location') %]</td>
+            <td class="status">[% l('Status') %]</td>
         </tr>
         [%- 
         FOR copy_info IN ctx.copies;
@@ -37,13 +37,13 @@ END;
         -%]
         <tr>
             <td class="location">[% ctx.get_aou(copy_info.circ_lib).name | html %]</td>
-            <td class="loc_info"><a href="javascript:;">View Library Info</a></td><!-- TODO -->
-            <td class="status">[% copy_info.copy_status | html %]</td>
             [%- IF has_parts == 'true' %]
             <td class="callnumber">[% l('[_1] ([_2])', callnum, copy_info.part_label) | html %]</td>
             [% ELSE %]
             <td class="callnumber">[% callnum | html %]</td>
             [%- END %]
+            <td class="shelving_location">[% copy_info.copy_location | html %]</td>
+            <td class="status">[% copy_info.copy_status | html %]</td>
         </tr>
         [%- END %]
 

commit f2637d02138436d0fd38ee2b2a619435a8fc9c9b
Author: Ben Shum <bshum at biblio.org>
Date:   Wed Nov 21 14:17:59 2012 -0500

    KPAC - fix getit_results with short titles
    
    When using the "Get it" options to either add an item to a list or place an
    item on hold, one would get an internal server error whenever attemping this
    on a bib record with a short title.
    
    Turns out that the substr function that shortens the length of long titles
    breaks when the title is 18 characters or less.
    
    Add an IF check around the substr function to avoid this error.
    
    Signed-off-by: Ben Shum <bshum at biblio.org>
    Signed-off-by: Michael Peters <mrpeters at library.in.gov>

diff --git a/Open-ILS/src/templates/kpac/getit_results.tt2 b/Open-ILS/src/templates/kpac/getit_results.tt2
index bdcfd7f..ace6ce5 100644
--- a/Open-ILS/src/templates/kpac/getit_results.tt2
+++ b/Open-ILS/src/templates/kpac/getit_results.tt2
@@ -55,7 +55,7 @@
         <td nowrap="nowrap">
             <a class="checkout_res_back" href="[% mkurl(ctx.kpac_root _ '/record/' _ ctx.bre_id, {}, kill_params) %]">
                 [%  title = attrs.title || '';
-                    title = title.substr(18, title.length, '...');
+                    IF title.length > 18; title = title.substr(18, title.length, '...'); END;
                     l('Back to [_1]', title);
                 %]
             </a>

commit 419194ddf821ab675dccbb91f9e887daa1934a4c
Author: Ben Shum <bshum at biblio.org>
Date:   Mon Nov 19 17:34:33 2012 -0500

    KPAC - fix Get It and pickup library selector
    
    Change PROCESS to INCLUDE to prevent variable leaks from breaking
    the pickup library selector's values.
    
    Signed-off-by: Ben Shum <bshum at biblio.org>
    Signed-off-by: Michael Peters <mrpeters at library.in.gov>

diff --git a/Open-ILS/src/templates/kpac/getit.tt2 b/Open-ILS/src/templates/kpac/getit.tt2
index 72619b0..b4942df 100644
--- a/Open-ILS/src/templates/kpac/getit.tt2
+++ b/Open-ILS/src/templates/kpac/getit.tt2
@@ -3,7 +3,7 @@
     PROCESS "opac/parts/misc_util.tt2"; # MARC 
     WRAPPER "kpac/parts/subpage.tt2";
     attrs = {marc_xml => ctx.marc_xml};
-    PROCESS get_marc_attrs args=attrs;
+    INCLUDE get_marc_attrs args=attrs;
     ctx.page_title = attrs.title | html 
 %]
 
@@ -70,7 +70,7 @@
                                 <div class="pickup_lib">
                                     [%  def_lib = ctx.default_pickup_lib || ctx.physical_loc;
                                         PROCESS "opac/parts/org_selector.tt2";
-                                        PROCESS build_org_selector name='pickup_lib' 
+                                        INCLUDE build_org_selector name='pickup_lib' 
                                         value=def_lib id='pickup_lib' can_have_vols_only=1 %]
                                 </div>
                             </div>

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

Summary of changes:
 Open-ILS/src/templates/kpac/getit.tt2            |    4 ++--
 Open-ILS/src/templates/kpac/getit_results.tt2    |    2 +-
 Open-ILS/src/templates/kpac/parts/copy_table.tt2 |    8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Evergreen ILS