[open-ils-commits] [GIT] Evergreen ILS branch master updated. 2f78b18c080f349b18ace56c77e6c3c712e8f8b3

[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  2f78b18c080f349b18ace56c77e6c3c712e8f8b3 (commit)
       via  d9332ad960832a9d7ccdaf44041c307d025bfe15 (commit)
      from  e39cf3076218dd7d1e13bdbb0eb50d2d60600dc9 (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 2f78b18c080f349b18ace56c77e6c3c712e8f8b3
Author: Jason Stephenson <jstephenson at mvlc.org>
Date:   Sat Apr 20 09:49:27 2013 -0400

    Fix version number in 0793.data.best-hold-order-traditional-approx.sql
    
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/src/sql/Pg/upgrade/0793.data.best-hold-order-traditional-approx.sql b/Open-ILS/src/sql/Pg/upgrade/0793.data.best-hold-order-traditional-approx.sql
index 01db997..d0aaf97 100644
--- a/Open-ILS/src/sql/Pg/upgrade/0793.data.best-hold-order-traditional-approx.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0793.data.best-hold-order-traditional-approx.sql
@@ -1,6 +1,6 @@
 BEGIN;
 
-SELECT evergreen.upgrade_deps_block_check('0792', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('0793', :eg_version);
 
 UPDATE config.best_hold_order
 SET

commit d9332ad960832a9d7ccdaf44041c307d025bfe15
Author: Jason Stephenson <jason at sigio.com>
Date:   Sat Apr 20 09:28:37 2013 -0400

    Add missing [% in prefs_settings.tt2.
    
    Signed-off-by: Jason Stephenson <jason at sigio.com>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2 b/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2
index 7f682a2..7b27be7 100644
--- a/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2
+++ b/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2
@@ -20,7 +20,7 @@
 
                 [%- setting = 'opac.hits_per_page' -%]
                 <tr >
-                    <td width='20%'><label for='[% setting %]'>l("Search hits per page") %]</label></td>
+                    <td width='20%'><label for='[% setting %]'>[% l("Search hits per page") %]</label></td>
                     <td>
                         <select id='[% setting %]' name='[% setting %]'>
                             [%  UNLESS ctx.user_setting_map.$setting;

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

Summary of changes:
 ...793.data.best-hold-order-traditional-approx.sql |    2 +-
 .../src/templates/opac/myopac/prefs_settings.tt2   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS