changed library setting name and added ID reporter field to fm_IDL

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 8ad8019..85cec9a 100644 (file)
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -2416,6 +2416,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
             JOIN actor.usr au on au.id = ac.usr 
                ]]></oils_persist:source_definition>
                <fields oils_persist:primary="id">
+            <field reporter:label="Password ID" name="id" reporter:datatype="id" />
             <field reporter:label="User ID" name="usr" reporter:datatype="id" />
             <field reporter:label="User Home OU" name="home_ou" reporter:datatype="id" />
                        <field reporter:label="Create Date" name="create_date" reporter:datatype="timestamp"/>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
index 5b9b320..be29646 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
@@ -15,7 +15,6 @@ use OpenILS::Utils::Fieldmapper;
 use OpenSRF::Utils::Cache;
 use OpenILS::Event;
 use DateTime::Format::ISO8601;
-use Data::Dumper;
 use CGI qw(:all -utf8);
 use Time::HiRes;
 

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 2a12e46..c70474a 100644 (file)
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -21310,16 +21310,16 @@ INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable)
 INSERT INTO config.org_unit_setting_type
     (name, grp, label, description, datatype)
     VALUES (
-        'global.password_reset_age',
-        'glob',
+        'auth.password_expire_age',
+        'sec',
         oils_i18n_gettext(
-            'global.password_reset_age',
+            'auth.password_expire_age',
             'Password Reset Age',
             'coust',
             'label'
         ),
         oils_i18n_gettext(
-            'global.password_reset_age',
+            'auth.password_expire_age',
             'The number of days after a password has been changed before ' || 
                        'users will be alerted that they should update it.',
             'coust',

diff --git a/Open-ILS/src/sql/Pg/upgrade/xxxx.data.password_age_reset.sql b/Open-ILS/src/sql/Pg/upgrade/xxxx.data.password_age_reset.sql
index 9a7ce68..036ad0a 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/xxxx.data.password_age_reset.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/xxxx.data.password_age_reset.sql
@@ -7,16 +7,16 @@ BEGIN;
 INSERT INTO config.org_unit_setting_type
     (name, grp, label, description, datatype)
     VALUES (
-        'global.password_reset_age',
-        'glob',
+        'auth.password_expire_age',
+        'sec',
         oils_i18n_gettext(
-            'global.password_reset_age',
+            'auth.password_expire_age',
             'Password Reset Age',
             'coust',
             'label'
         ),
         oils_i18n_gettext(
-            'global.password_reset_age',
+            'auth.password_expire_age',
             'The number of days after a password has been changed before ' || 
                        'users will be alerted that they should update it.',
             'coust',

diff --git a/Open-ILS/src/templates/opac/parts/config.tt2 b/Open-ILS/src/templates/opac/parts/config.tt2
index 9de990e..da7c15d 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/config.tt2
+++ b/Open-ILS/src/templates/opac/parts/config.tt2
@@ -292,5 +292,5 @@ contents_truncate_length = 50;
 
 # days since last password change to start reminding a patron to change their password
 # commenting out this line will disable the reminder
-ctx.password_age_reminder = ctx.get_org_setting(ctx.physical_loc || 1, 'global.password_reset_age');
+ctx.password_age_reminder = ctx.get_org_setting(ctx.physical_loc || 1, 'auth.password_expire_age');
 %]

diff --git a/Open-ILS/web/js/ui/default/staff/app.js b/Open-ILS/web/js/ui/default/staff/app.js
index aa3ba9b..8dd0c10 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/app.js
+++ b/Open-ILS/web/js/ui/default/staff/app.js
@@ -161,8 +161,8 @@ function($routeProvider , $locationProvider) {
     
        egCore.strings.setPageTitle(
         egCore.strings['PAGE_TITLE_SPLASH']);
-    egCore.org.settingsFromServer(['global.password_reset_age','global.password_regex']).then(function(settings) {
-            $scope.password_reset_age = parseInt(settings['global.password_reset_age']);
+    egCore.org.settingsFromServer(['auth.password_expire_age','global.password_regex']).then(function(settings) {
+            $scope.password_reset_age = parseInt(settings['auth.password_expire_age']);
         });
     egCore.net.request(
                 'open-ils.actor',