[open-ils-commits] [GIT] Evergreen ILS branch master updated. 73f71659fa2d1dd6bcbc726cd24d9563e9df52d4
Evergreen Git
git at git.evergreen-ils.org
Fri Jul 12 15:38:46 EDT 2013
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 73f71659fa2d1dd6bcbc726cd24d9563e9df52d4 (commit)
via 85bba93741c8292bcab30c301b18e6fa79640c2a (commit)
from 2532f01f3f6b8eec6fcbc72e42edfc9039150ad6 (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 73f71659fa2d1dd6bcbc726cd24d9563e9df52d4
Author: Ben Shum <bshum at biblio.org>
Date: Fri Jul 12 15:36:06 2013 -0400
Stamping upgrade script for making state not required in org unit address
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 8eae7a7..9b831b9 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 ('0807', :eg_version); -- tsbere/phasefx
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0809', :eg_version); -- paxed/bshum
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/0809.schema.org-addr-state-null.sql b/Open-ILS/src/sql/Pg/upgrade/0809.schema.org-addr-state-null.sql
new file mode 100644
index 0000000..51a215a
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0809.schema.org-addr-state-null.sql
@@ -0,0 +1,8 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('0809', :eg_version);
+
+ALTER TABLE actor.org_address ALTER COLUMN state DROP NOT NULL;
+
+COMMIT;
+
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.org-addr-state-null.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.org-addr-state-null.sql
deleted file mode 100644
index 86d8bf3..0000000
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.org-addr-state-null.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN;
-
-ALTER TABLE actor.org_address ALTER COLUMN state DROP NOT NULL;
-
-COMMIT;
\ No newline at end of file
commit 85bba93741c8292bcab30c301b18e6fa79640c2a
Author: Pasi Kallinen <pasi.kallinen at pttk.fi>
Date: Mon Jun 10 10:32:41 2013 +0300
Do not explicitly require the state field in org unit addresses.
Signed-off-by: Pasi Kallinen <pasi.kallinen at pttk.fi>
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/Open-ILS/src/sql/Pg/005.schema.actors.sql b/Open-ILS/src/sql/Pg/005.schema.actors.sql
index d9ea689..4c6d156 100644
--- a/Open-ILS/src/sql/Pg/005.schema.actors.sql
+++ b/Open-ILS/src/sql/Pg/005.schema.actors.sql
@@ -605,7 +605,7 @@ CREATE TABLE actor.org_address (
street2 TEXT,
city TEXT NOT NULL,
county TEXT,
- state TEXT NOT NULL,
+ state TEXT,
country TEXT NOT NULL,
post_code TEXT NOT NULL,
san TEXT
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.org-addr-state-null.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.org-addr-state-null.sql
new file mode 100644
index 0000000..86d8bf3
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.org-addr-state-null.sql
@@ -0,0 +1,5 @@
+BEGIN;
+
+ALTER TABLE actor.org_address ALTER COLUMN state DROP NOT NULL;
+
+COMMIT;
\ No newline at end of file
diff --git a/Open-ILS/web/conify/global/actor/org_unit.html b/Open-ILS/web/conify/global/actor/org_unit.html
index 6235e7f..8d49513 100644
--- a/Open-ILS/web/conify/global/actor/org_unit.html
+++ b/Open-ILS/web/conify/global/actor/org_unit.html
@@ -572,7 +572,7 @@
</tr>
<tr>
<th>&conify.org_unit.addresses_pane.city;</th><td><span jsId="billing_addr_city" style="width:100%;" dojoType="dijit.form.ValidationTextBox" onChange="current_billing_address.city( this.getValue() )" required="true"></span></td>
- <th>&conify.org_unit.addresses_pane.state;</th><td><span jsId="billing_addr_state" style="width:100%;" dojoType="dijit.form.ValidationTextBox" size="2" maxSize="2" uppercase="true" onChange="current_billing_address.state( this.getValue() )" required="true"></span></td>
+ <th>&conify.org_unit.addresses_pane.state;</th><td><span jsId="billing_addr_state" style="width:100%;" dojoType="dijit.form.ValidationTextBox" size="2" maxSize="2" uppercase="true" onChange="current_billing_address.state( this.getValue() )"></span></td>
<th>&conify.org_unit.addresses_pane.zip;</th><td><span jsId="billing_addr_post_code" style="width:100%;" dojoType="dijit.form.ValidationTextBox" size="10" maxSize="10" regExp="^\d{5}(?:-\d{4})?$" uppercase="true" onChange="current_billing_address.post_code( this.getValue() )" required="true"></span></td>
</tr>
<tr>
@@ -640,7 +640,7 @@
</tr>
<tr>
<th>&conify.org_unit.addresses_pane.city;</th><td><span jsId="holds_addr_city" style="width:100%;" dojoType="dijit.form.ValidationTextBox" onChange="current_holds_address.city( this.getValue() )" required="true"></span></td>
- <th>&conify.org_unit.addresses_pane.state;</th><td><span jsId="holds_addr_state" style="width:100%;" dojoType="dijit.form.ValidationTextBox" size="2" maxSize="2" uppercase="true" onChange="current_holds_address.state( this.getValue() )" required="true"></span></td>
+ <th>&conify.org_unit.addresses_pane.state;</th><td><span jsId="holds_addr_state" style="width:100%;" dojoType="dijit.form.ValidationTextBox" size="2" maxSize="2" uppercase="true" onChange="current_holds_address.state( this.getValue() )"></span></td>
<th>&conify.org_unit.addresses_pane.zip;</th><td><span jsId="holds_addr_post_code" style="width:100%;" dojoType="dijit.form.ValidationTextBox" size="10" maxSize="10" regExp="^\d{5}(?:-\d{4})?$" uppercase="true" onChange="current_holds_address.post_code( this.getValue() )" required="true"></span></td>
</tr>
<tr>
@@ -707,7 +707,7 @@
</tr>
<tr>
<th>&conify.org_unit.addresses_pane.city;</th><td><span jsId="mailing_addr_city" style="width:100%;" dojoType="dijit.form.ValidationTextBox" onChange="current_mailing_address.city( this.getValue() )" required="true"></span></td>
- <th>&conify.org_unit.addresses_pane.state;</th><td><span jsId="mailing_addr_state" style="width:100%;" dojoType="dijit.form.ValidationTextBox" size="2" maxSize="2" uppercase="true" onChange="current_mailing_address.state( this.getValue() )" required="true"></span></td>
+ <th>&conify.org_unit.addresses_pane.state;</th><td><span jsId="mailing_addr_state" style="width:100%;" dojoType="dijit.form.ValidationTextBox" size="2" maxSize="2" uppercase="true" onChange="current_mailing_address.state( this.getValue() )"></span></td>
<th>&conify.org_unit.addresses_pane.zip;</th><td><span jsId="mailing_addr_post_code" style="width:100%;" dojoType="dijit.form.ValidationTextBox" size="10" maxSize="10" regExp="^\d{5}(?:-\d{4})?$" uppercase="true" onChange="current_mailing_address.post_code( this.getValue() )" required="true"></span></td>
</tr>
<tr>
@@ -774,7 +774,7 @@
</tr>
<tr>
<th>&conify.org_unit.addresses_pane.city;</th><td><span jsId="ill_addr_city" style="width:100%;" dojoType="dijit.form.ValidationTextBox" onChange="current_ill_address.city( this.getValue() )" required="true"></span></td>
- <th>&conify.org_unit.addresses_pane.state;</th><td><span jsId="ill_addr_state" style="width:100%;" dojoType="dijit.form.ValidationTextBox" size="2" maxSize="2" uppercase="true" onChange="current_ill_address.state( this.getValue() )" required="true"></span></td>
+ <th>&conify.org_unit.addresses_pane.state;</th><td><span jsId="ill_addr_state" style="width:100%;" dojoType="dijit.form.ValidationTextBox" size="2" maxSize="2" uppercase="true" onChange="current_ill_address.state( this.getValue() )"></span></td>
<th>&conify.org_unit.addresses_pane.zip;</th><td><span jsId="ill_addr_post_code" style="width:100%;" dojoType="dijit.form.ValidationTextBox" size="10" maxSize="10" regExp="^\d{5}(?:-\d{4})?$" uppercase="true" onChange="current_ill_address.post_code( this.getValue() )" required="true"></span></td>
</tr>
<tr>
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/005.schema.actors.sql | 2 +-
.../Pg/upgrade/0809.schema.org-addr-state-null.sql | 8 ++++++++
Open-ILS/web/conify/global/actor/org_unit.html | 8 ++++----
4 files changed, 14 insertions(+), 6 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/0809.schema.org-addr-state-null.sql
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list