LP1079041 - making state not required (continued)

The last commit did not add the default YAOUS to the seed data. Also, some
wording tweaks to bring the content in line with the existing entries for
consistency.

Signed-off-by: Ben Shum <bshum@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 c679de4..d181ff4 100644 (file)
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -4556,6 +4556,33 @@ INSERT into config.org_unit_setting_type
         'coust', 'description'),
     'bool', null)
 
         'coust', 'description'),
     'bool', null)
 

+,( 'ui.patron.edit.au.state.require', 'gui',
+    oils_i18n_gettext('ui.patron.edit.au.state.require',
+        'Require State field on patron registration',
+        'coust', 'label'),
+    oils_i18n_gettext('ui.patron.edit.au.state.require',
+        'The State field will be required on the patron registration screen.',
+        'coust', 'description'),
+    'bool', null)
+
+,( 'ui.patron.edit.au.state.show', 'gui',
+    oils_i18n_gettext('ui.patron.edit.au.state.show',
+        'Show State field on patron registration',
+        'coust', 'label'),
+    oils_i18n_gettext('ui.patron.edit.au.state.show',
+        'The State field will be shown on the patron registration screen. Showing a field makes it appear with required fields even when not required. If the field is required this setting is ignored.',
+        'coust', 'description'),
+    'bool', null)
+
+,( 'ui.patron.edit.au.state.suggest', 'gui',
+    oils_i18n_gettext('ui.patron.edit.au.state.suggest',
+        'Suggest State field on patron registration',
+        'coust', 'label'),
+    oils_i18n_gettext('ui.patron.edit.au.state.suggest',
+        'The State field will be suggested on the patron registration screen. Suggesting a field makes it appear when suggested fields are shown. If the field is shown or required this setting is ignored.',
+        'coust', 'description'),
+    'bool', null)
+

 ,( 'ui.patron.edit.aua.post_code.example', 'gui',
     oils_i18n_gettext('ui.patron.edit.aua.post_code.example',
         'Example for post_code field on patron registration',
 ,( 'ui.patron.edit.aua.post_code.example', 'gui',
     oils_i18n_gettext('ui.patron.edit.aua.post_code.example',
         'Example for post_code field on patron registration',

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.state_field_required_toggle.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.state_field_required_toggle.sql
index 8289231..9562259 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.state_field_required_toggle.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.state_field_required_toggle.sql
@@ -2,7 +2,7 @@ BEGIN;
 
 SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
 
 
 SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
 

--- state can no longer be a "not null"
+-- allow state to be null

 ALTER TABLE actor.usr_address ALTER COLUMN state DROP NOT NULL;
 
 -- create new YAOUS
 ALTER TABLE actor.usr_address ALTER COLUMN state DROP NOT NULL;
 
 -- create new YAOUS


@@ -13,13 +13,13 @@ INSERT into config.org_unit_setting_type
         'gui',
         oils_i18n_gettext(
             'ui.patron.edit.au.state.require',
         'gui',
         oils_i18n_gettext(
             'ui.patron.edit.au.state.require',

-            'Require State on registration',
+            'Require State field on patron registration',

             'coust',
             'label'
         ),
         oils_i18n_gettext(
             'ui.patron.edit.au.state.require',
             'coust',
             'label'
         ),
         oils_i18n_gettext(
             'ui.patron.edit.au.state.require',

-            'Require the State field to be filled when registering or editing a patron.',
+            'The State field will be required on the patron registration screen.',

             'coust',
             'description'
         ),
             'coust',
             'description'
         ),


@@ -33,13 +33,13 @@ INSERT into config.org_unit_setting_type
         'gui',
         oils_i18n_gettext(
             'ui.patron.edit.au.state.show',
         'gui',
         oils_i18n_gettext(
             'ui.patron.edit.au.state.show',

-            'Show State on registration',
+            'Show State field on patron registration',

             'coust',
             'label'
         ),
         oils_i18n_gettext(
             'ui.patron.edit.au.state.show',
             'coust',
             'label'
         ),
         oils_i18n_gettext(
             'ui.patron.edit.au.state.show',

-            'Show the state field when registering or editing a patron.',
+            'The State field will be shown on the patron registration screen. Showing a field makes it appear with required fields even when not required. If the field is required this setting is ignored.',

             'coust',
             'description'
         ),
             'coust',
             'description'
         ),


@@ -53,13 +53,13 @@ INSERT into config.org_unit_setting_type
         'gui',
         oils_i18n_gettext(
             'ui.patron.edit.au.state.suggest',
         'gui',
         oils_i18n_gettext(
             'ui.patron.edit.au.state.suggest',

-            'Suggest State on registration',
+            'Suggest State field on patron registration',

             'coust',
             'label'
         ),
         oils_i18n_gettext(
             'ui.patron.edit.au.state.suggest',
             'coust',
             'label'
         ),
         oils_i18n_gettext(
             'ui.patron.edit.au.state.suggest',

-            'Suggest filling the state field when registering or editing a patron.',
+            'The State field will be suggested on the patron registration screen. Suggesting a field makes it appear when suggested fields are shown. If the field is shown or required this setting is ignored.',

             'coust',
             'description'
         ),
             'coust',
             'description'
         ),