From da14c44d25a05e4aad631f044193957607271f45 Mon Sep 17 00:00:00 2001 From: Jason Etheridge Date: Tue, 4 Oct 2011 13:20:41 -0400 Subject: [PATCH] pin version for upgrade script and put seed data back in; I had merge-conflict-resolved it out of existence previously Signed-off-by: Jason Etheridge --- Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +- Open-ILS/src/sql/Pg/950.data.seed-values.sql | 21 ++++++++++++++++++++- ...w_print_method.sql => 0633.new_print_method.sql} | 7 +++++++ 3 files changed, 28 insertions(+), 2 deletions(-) rename Open-ILS/src/sql/Pg/upgrade/{XXXX.new_print_method.sql => 0633.new_print_method.sql} (85%) diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql index 485ee715fd..74d3fcaf7a 100644 --- a/Open-ILS/src/sql/Pg/002.schema.config.sql +++ b/Open-ILS/src/sql/Pg/002.schema.config.sql @@ -57,7 +57,7 @@ CREATE TABLE config.upgrade_log ( install_date TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW() ); -INSERT INTO config.upgrade_log (version) VALUES ('0631'); -- senator/miker +INSERT INTO config.upgrade_log (version) VALUES ('0633'); -- tsbere/phasefx CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, 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 c0b1d5a714..3751ba44aa 100644 --- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql +++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql @@ -2726,7 +2726,26 @@ INSERT into config.org_unit_setting_type ( 'opac.fully_compressed_serial_holdings', oils_i18n_gettext('opac.fully_compressed_serial_holdings', 'OPAC: Use fully compressed serial holdings', 'coust', 'label'), oils_i18n_gettext('opac.fully_compressed_serial_holdings', 'Show fully compressed serial holdings for all libraries at and below the current context unit', 'coust', 'description'), - 'bool') + 'bool'), + +( + 'print.custom_js_file', + oils_i18n_gettext( + 'print.custom_js_file', + 'Printing: Custom Javascript File', + 'coust', + 'label' + ), + oils_i18n_gettext( + 'print.custom_js_file', + 'Full URL path to a Javascript File to be loaded when printing. Should' + || ' implement a print_custom function for DOM manipulation. Can change' + || ' the value of the do_print variable to false to cancel printing.', + 'coust', + 'description' + ), + 'string' + ) ; UPDATE config.org_unit_setting_type diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.new_print_method.sql b/Open-ILS/src/sql/Pg/upgrade/0633.new_print_method.sql similarity index 85% rename from Open-ILS/src/sql/Pg/upgrade/XXXX.new_print_method.sql rename to Open-ILS/src/sql/Pg/upgrade/0633.new_print_method.sql index bb7d8daf57..9298aaf120 100644 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.new_print_method.sql +++ b/Open-ILS/src/sql/Pg/upgrade/0633.new_print_method.sql @@ -1,3 +1,8 @@ +BEGIN; + +-- check whether patch can be applied +SELECT evergreen.upgrade_deps_block_check('0633', :eg_version); + INSERT into config.org_unit_setting_type ( name, grp, label, description, datatype ) VALUES ( @@ -18,3 +23,5 @@ INSERT into config.org_unit_setting_type ), 'string' ); + +COMMIT; -- 2.11.0