[open-ils-commits] ***SPAM*** [GIT] Evergreen ILS branch rel_2_5 updated. 26ec2c5d54ad3a106337542fd73130406d560441

[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_5 has been updated
       via  26ec2c5d54ad3a106337542fd73130406d560441 (commit)
       via  adec54f4e7804a0003dcd5ab6356a4c50bfcdaca (commit)
      from  781f489efe44468db53bff2a8333cd0621667f54 (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 26ec2c5d54ad3a106337542fd73130406d560441
Author: Ben Shum <bshum at biblio.org>
Date:   Tue Dec 17 14:59:44 2013 -0500

    Stamping 0849 - desk renewal description
    
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 2744e49..32fef43 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -91,7 +91,7 @@ CREATE TRIGGER no_overlapping_deps
     BEFORE INSERT OR UPDATE ON config.db_patch_dependencies
     FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');
 
-INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0848', :eg_version); -- miker
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0849', :eg_version); -- callender/bshum
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/xxxx.schema.desk_renewal_desc_update b/Open-ILS/src/sql/Pg/upgrade/0849.schema.desk_renewal_desc_update.sql
similarity index 76%
rename from Open-ILS/src/sql/Pg/upgrade/xxxx.schema.desk_renewal_desc_update
rename to Open-ILS/src/sql/Pg/upgrade/0849.schema.desk_renewal_desc_update.sql
index 0432b9e..160962d 100644
--- a/Open-ILS/src/sql/Pg/upgrade/xxxx.schema.desk_renewal_desc_update
+++ b/Open-ILS/src/sql/Pg/upgrade/0849.schema.desk_renewal_desc_update.sql
@@ -1,6 +1,6 @@
 BEGIN;
 
-INSERT INTO config.upgrade_log (version) VALUES ('xxxx');
+SELECT evergreen.upgrade_deps_block_check('0849', :eg_version);
 
 UPDATE config.global_flag
     SET label = 'Circ: Use original circulation library on desk renewal instead of the workstation library'

commit adec54f4e7804a0003dcd5ab6356a4c50bfcdaca
Author: Steven Callender <stevecallender at esilibrary.com>
Date:   Thu Dec 12 15:13:57 2013 -0500

    Updated the label on the desk renewal global setting.
    
    Updated the label on the desk renewal global flag circ.desk_renewal.use_original_circ_lib
    to properly explain the it's the workstation library that will not be used rather than the
    user home library. The OPAC renewal uses the users home library and desk renewals use
    the workstation library.
    
    Signed-off-by: Steven Callender <stevecallender at esilibrary.com>
    Signed-off-by: Ben Shum <bshum at biblio.org>

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 d482914..770443e 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -9292,7 +9292,7 @@ INSERT INTO config.global_flag (name, label, enabled)
         'circ.desk_renewal.use_original_circ_lib',
         oils_i18n_gettext(
             'circ.desk_renewal.use_original_circ_lib',
-            'Circ: Use original circulation library on desk renewal instead of user home library',
+            'Circ: Use original circulation library on desk renewal instead of the workstation library',
             'cgf',
             'label'
         ),
diff --git a/Open-ILS/src/sql/Pg/upgrade/xxxx.schema.desk_renewal_desc_update b/Open-ILS/src/sql/Pg/upgrade/xxxx.schema.desk_renewal_desc_update
new file mode 100644
index 0000000..0432b9e
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/xxxx.schema.desk_renewal_desc_update
@@ -0,0 +1,10 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('xxxx');
+
+UPDATE config.global_flag
+    SET label = 'Circ: Use original circulation library on desk renewal instead of the workstation library'
+    WHERE name = 'circ.desk_renewal.use_original_circ_lib';
+
+COMMIT;
+

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

Summary of changes:
 Open-ILS/src/sql/Pg/002.schema.config.sql          |    2 +-
 Open-ILS/src/sql/Pg/950.data.seed-values.sql       |    2 +-
 .../0849.schema.desk_renewal_desc_update.sql       |   10 ++++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 Open-ILS/src/sql/Pg/upgrade/0849.schema.desk_renewal_desc_update.sql


hooks/post-receive
-- 
Evergreen ILS