[open-ils-commits] ***SPAM*** [GIT] Evergreen ILS branch master updated. 4836d0b5f28316cf1802e437588103334523dfaa
Evergreen Git
git at git.evergreen-ils.org
Thu Jul 10 14:52:25 EDT 2014
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 4836d0b5f28316cf1802e437588103334523dfaa (commit)
via 7c0562b55b42af3bd7ccad8e4f87f338a2dfe511 (commit)
via 3f2be6c36f423a521000f6018dd82ec975800fbe (commit)
from fcfff08a541b4ed2ed244ea4cb10d53f42128a3b (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 4836d0b5f28316cf1802e437588103334523dfaa
Author: Ben Shum <bshum at biblio.org>
Date: Thu Jul 10 14:51:57 2014 -0400
LP#1210161: Stamping upgrade script to rename bookbag to list
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 e03ec55..9e5641b 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 ('0883', :eg_version); -- miker/bshum
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0884', :eg_version); -- rsteed/bshum
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.rename_bookbag_to_mylist.sql b/Open-ILS/src/sql/Pg/upgrade/0884.data.rename_bookbag_to_mylist.sql
similarity index 96%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.data.rename_bookbag_to_mylist.sql
rename to Open-ILS/src/sql/Pg/upgrade/0884.data.rename_bookbag_to_mylist.sql
index 4eeb22b..0589bc3 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.rename_bookbag_to_mylist.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0884.data.rename_bookbag_to_mylist.sql
@@ -1,6 +1,6 @@
BEGIN;
-- check whether patch can be applied
--- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('0884', :eg_version);
UPDATE container.biblio_record_entry_bucket_type
SET label = oils_i18n_gettext(
commit 7c0562b55b42af3bd7ccad8e4f87f338a2dfe511
Author: Remington Steed <rjs7 at calvin.edu>
Date: Wed Feb 12 10:34:51 2014 -0500
LP#1210161: Upgrade script to rename bookbag to list
Signed-off-by: Remington Steed <rjs7 at calvin.edu>
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.rename_bookbag_to_mylist.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.rename_bookbag_to_mylist.sql
new file mode 100644
index 0000000..4eeb22b
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.rename_bookbag_to_mylist.sql
@@ -0,0 +1,73 @@
+BEGIN;
+-- check whether patch can be applied
+-- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+UPDATE container.biblio_record_entry_bucket_type
+SET label = oils_i18n_gettext(
+ 'bookbag',
+ 'Book List',
+ 'cbrebt',
+ 'label'
+) WHERE code = 'bookbag';
+
+UPDATE container.user_bucket_type
+SET label = oils_i18n_gettext(
+ 'folks:pub_book_bags.view',
+ 'List Published Book Lists',
+ 'cubt',
+ 'label'
+) WHERE code = 'folks:pub_book_bags.view';
+
+UPDATE container.user_bucket_type
+SET label = oils_i18n_gettext(
+ 'folks:pub_book_bags.add',
+ 'Add to Published Book Lists',
+ 'cubt',
+ 'label'
+) WHERE code = 'folks:pub_book_bags.add';
+
+UPDATE action_trigger.hook
+SET description = oils_i18n_gettext(
+ 'container.biblio_record_entry_bucket.csv',
+ 'Produce a CSV file representing a book list',
+ 'ath',
+ 'description'
+) WHERE key = 'container.biblio_record_entry_bucket.csv';
+
+UPDATE action_trigger.reactor
+SET description = oils_i18n_gettext(
+ 'ContainerCSV',
+ 'Facilitates producing a CSV file representing a book list by introducing an "items" variable into the TT environment, sorted as dictated according to user params',
+ 'atr',
+ 'description'
+)
+WHERE module = 'ContainerCSV';
+
+UPDATE action_trigger.event_definition
+SET template = REPLACE(template, 'bookbag', 'book list'),
+name = 'Book List CSV'
+WHERE name = 'Bookbag CSV';
+
+UPDATE config.org_unit_setting_type
+SET description = oils_i18n_gettext(
+ 'opac.patron.temporary_list_warn',
+ 'Present a warning dialog to the patron when a patron adds a book to a temporary book list.',
+ 'coust',
+ 'description'
+) WHERE name = 'opac.patron.temporary_list_warn';
+
+UPDATE config.usr_setting_type
+SET label = oils_i18n_gettext(
+ 'opac.default_list',
+ 'Default list to use when adding to a list',
+ 'cust',
+ 'label'
+),
+description = oils_i18n_gettext(
+ 'opac.default_list',
+ 'Default list to use when adding to a list',
+ 'cust',
+ 'description'
+) WHERE name = 'opac.default_list';
+
+COMMIT;
commit 3f2be6c36f423a521000f6018dd82ec975800fbe
Author: Remington Steed <rjs7 at calvin.edu>
Date: Wed Nov 27 15:39:11 2013 -0500
LP#1210161: Finish renaming bookbag to list
The JSPAC bookbag feature was renamed to "Lists" in TPAC, but several
references still exist to "bookbag", "book bag", "Book Bag", etc. in the
public and staff interfaces. This commit attempts to provide simple and
clear replacements for the old term. In some cases "list" seems best,
but where the context is uncertain "book list" is used to err on the
side of clarity. Some of these changes may be in old code that is no
longer used.
This commit also includes two minor wording changes - one to fix grammar,
and the second to update instructions for sharing a list.
Signed-off-by: Remington Steed <rjs7 at calvin.edu>
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 be6fa5b..7801cd5 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -5146,15 +5146,15 @@ INSERT INTO container.copy_bucket_type (code,label) VALUES ( 'circ_history', 'Ci
INSERT INTO container.call_number_bucket_type (code,label) VALUES ('misc', oils_i18n_gettext('misc', 'Miscellaneous', 'ccnbt', 'label'));
INSERT INTO container.biblio_record_entry_bucket_type (code,label) VALUES ('misc', oils_i18n_gettext('misc', 'Miscellaneous', 'cbrebt', 'label'));
INSERT INTO container.biblio_record_entry_bucket_type (code,label) VALUES ('staff_client', oils_i18n_gettext('staff_client', 'General Staff Client container', 'cbrebt', 'label'));
-INSERT INTO container.biblio_record_entry_bucket_type (code,label) VALUES ('bookbag', oils_i18n_gettext('bookbag', 'Book Bag', 'cbrebt', 'label'));
+INSERT INTO container.biblio_record_entry_bucket_type (code,label) VALUES ('bookbag', oils_i18n_gettext('bookbag', 'Book List', 'cbrebt', 'label'));
INSERT INTO container.biblio_record_entry_bucket_type (code,label) VALUES ('reading_list', oils_i18n_gettext('reading_list', 'Reading List', 'cbrebt', 'label'));
INSERT INTO container.biblio_record_entry_bucket_type (code,label) VALUES ('template_merge',oils_i18n_gettext('template_merge','Template Merge Container', 'cbrebt', 'label'));
INSERT INTO container.biblio_record_entry_bucket_type (code,label) VALUES ('url_verify', oils_i18n_gettext('url_verify', 'URL Verification Queue', 'cbrebt', 'label'));
INSERT INTO container.user_bucket_type (code,label) VALUES ('misc', oils_i18n_gettext('misc', 'Miscellaneous', 'cubt', 'label'));
INSERT INTO container.user_bucket_type (code,label) VALUES ('folks', oils_i18n_gettext('folks', 'Friends', 'cubt', 'label'));
-INSERT INTO container.user_bucket_type (code,label) VALUES ('folks:pub_book_bags.view', oils_i18n_gettext('folks:pub_book_bags.view', 'List Published Book Bags', 'cubt', 'label'));
-INSERT INTO container.user_bucket_type (code,label) VALUES ('folks:pub_book_bags.add', oils_i18n_gettext('folks:pub_book_bags.add', 'Add to Published Book Bags', 'cubt', 'label'));
+INSERT INTO container.user_bucket_type (code,label) VALUES ('folks:pub_book_bags.view', oils_i18n_gettext('folks:pub_book_bags.view', 'List Published Book Lists', 'cubt', 'label'));
+INSERT INTO container.user_bucket_type (code,label) VALUES ('folks:pub_book_bags.add', oils_i18n_gettext('folks:pub_book_bags.add', 'Add to Published Book Lists', 'cubt', 'label'));
INSERT INTO container.user_bucket_type (code,label) VALUES ('folks:circ.view', oils_i18n_gettext('folks:circ.view', 'View Circulations', 'cubt', 'label'));
INSERT INTO container.user_bucket_type (code,label) VALUES ('folks:circ.renew', oils_i18n_gettext('folks:circ.renew', 'Renew Circulations', 'cubt', 'label'));
INSERT INTO container.user_bucket_type (code,label) VALUES ('folks:circ.checkout', oils_i18n_gettext('folks:circ.checkout', 'Checkout Items', 'cubt', 'label'));
@@ -10931,7 +10931,7 @@ VALUES (
'cbreb',
oils_i18n_gettext(
'container.biblio_record_entry_bucket.csv',
- 'Produce a CSV file representing a bookbag',
+ 'Produce a CSV file representing a book list',
'ath',
'description'
),
@@ -10943,7 +10943,7 @@ VALUES (
'ContainerCSV',
oils_i18n_gettext(
'ContainerCSV',
- 'Facilitates produce a CSV file representing a bookbag by introducing an "items" variable into the TT environment, sorted as dictated according to user params',
+ 'Facilitates producing a CSV file representing a book list by introducing an "items" variable into the TT environment, sorted as dictated according to user params',
'atr',
'description'
)
@@ -10955,11 +10955,11 @@ INSERT INTO action_trigger.event_definition (
validator, template
) VALUES (
48, TRUE, 1,
- 'Bookbag CSV', 'container.biblio_record_entry_bucket.csv', 'ContainerCSV',
+ 'Book List CSV', 'container.biblio_record_entry_bucket.csv', 'ContainerCSV',
'NOOP_True',
$$
[%-
-# target is the bookbag itself. The 'items' variable does not need to be in
+# target is the book list itself. The 'items' variable does not need to be in
# the environment because a special reactor will take care of filling it in.
FOR item IN items;
@@ -12802,7 +12802,7 @@ INSERT into config.org_unit_setting_type
),
oils_i18n_gettext(
'opac.patron.temporary_list_warn',
- 'Present a warning dialog to the patron when a patron adds a book to a temporary book bag.',
+ 'Present a warning dialog to the patron when a patron adds a book to a temporary book list.',
'coust',
'description'
),
@@ -12838,13 +12838,13 @@ VALUES (
FALSE,
oils_i18n_gettext(
'opac.default_list',
- 'Default list to use when adding to a bookbag',
+ 'Default list to use when adding to a list',
'cust',
'label'
),
oils_i18n_gettext(
'opac.default_list',
- 'Default list to use when adding to a bookbag',
+ 'Default list to use when adding to a list',
'cust',
'description'
),
diff --git a/Open-ILS/src/templates/opac/myopac/lists.tt2 b/Open-ILS/src/templates/opac/myopac/lists.tt2
index acff603..b2c26d2 100644
--- a/Open-ILS/src/templates/opac/myopac/lists.tt2
+++ b/Open-ILS/src/templates/opac/myopac/lists.tt2
@@ -6,10 +6,10 @@
offset = ctx.bookbags_offset;
item_page = ctx.bookbags_item_page;
bb_publish_text = l(
-"Sharing a Bookbag means that the contents " _
-"of the Bookbag will be visible to others. " _
-"To see the public view of a shared Bookbag, " _
-"click on the Bookbag\\'s name in the Bookbag list.");
+"Sharing a list means that the contents " _
+"of the list will be visible to others. " _
+"To see the public view of a shared list, " _
+"click on the HTML View link in the Saved Lists section.");
%]
<h3 class="sr-only">[% l('My Lists') %]</h3>
<div id='myopac_bookbag_div' style="padding:5px;">
diff --git a/Open-ILS/src/templates/opac/parts/anon_list.tt2 b/Open-ILS/src/templates/opac/parts/anon_list.tt2
index 47e496f..a0b0dbf 100644
--- a/Open-ILS/src/templates/opac/parts/anon_list.tt2
+++ b/Open-ILS/src/templates/opac/parts/anon_list.tt2
@@ -32,7 +32,7 @@
<option value="place_hold">[% l('Place hold') %]</option>
<option value="delete">[% l('Remove from list') %]</option>
[% IF ctx.user AND ctx.bookbags.size %]
- <optgroup label="[% l('Move selected items to bookbag:') %]">
+ <optgroup label="[% l('Move selected items to list:') %]">
[% FOR bbag IN ctx.bookbags %]]
<option value="[% bbag.id %]" class="selector_actions_for_list_inner_option">[% bbag.name | html %]</option>
[% END %]
diff --git a/Open-ILS/src/templates/opac/parts/record/body.tt2 b/Open-ILS/src/templates/opac/parts/record/body.tt2
index bdb5f41..216f8f9 100644
--- a/Open-ILS/src/templates/opac/parts/record/body.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/body.tt2
@@ -8,7 +8,7 @@
[%- INCLUDE "opac/parts/record/navigation.tt2" %]
[%- IF ctx.bib_is_dead %]
<div id='rdetail_deleted_exp'>
- [% l("This record has been deleted from the database. We recommend that you remove this title from any bookbags it may have been added to.") %]
+ [% l("This record has been deleted from the database. We recommend that you remove this title from any lists it may have been added to.") %]
</div>
[%- END %]
[% INCLUDE "opac/parts/record/summary.tt2" %]
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/950.data.seed-values.sql | 20 +++---
.../upgrade/0884.data.rename_bookbag_to_mylist.sql | 73 ++++++++++++++++++++
Open-ILS/src/templates/opac/myopac/lists.tt2 | 8 +-
Open-ILS/src/templates/opac/parts/anon_list.tt2 | 2 +-
Open-ILS/src/templates/opac/parts/record/body.tt2 | 2 +-
6 files changed, 90 insertions(+), 17 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/0884.data.rename_bookbag_to_mylist.sql
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list