fetch org setting types from server now. yay.

git-svn-id: svn://svn.open-ils.org/ILS/trunk@13483 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/web/js/dojo/fieldmapper/Fieldmapper.js b/Open-ILS/web/js/dojo/fieldmapper/Fieldmapper.js
index 901d87d..9a69275 100644 (file)
--- a/Open-ILS/web/js/dojo/fieldmapper/Fieldmapper.js
+++ b/Open-ILS/web/js/dojo/fieldmapper/Fieldmapper.js
@@ -203,6 +203,7 @@ if(!dojo._hasResource["fieldmapper.Fieldmapper"]){
        fieldmapper.rxpt.Identifier = 'xact';
        fieldmapper.cxt.Identifier = 'name';
        fieldmapper.amtr.Identifier = 'matchpoint';
+       fieldmapper.coust.Identifier = 'name';
 
     }
 

diff --git a/Open-ILS/xul/staff_client/server/admin/org_unit_settings.js b/Open-ILS/xul/staff_client/server/admin/org_unit_settings.js
index 13bd9b3..f7a2152 100644 (file)
--- a/Open-ILS/xul/staff_client/server/admin/org_unit_settings.js
+++ b/Open-ILS/xul/staff_client/server/admin/org_unit_settings.js
@@ -11,11 +11,13 @@ dojo.require('openils.CGI');
 dojo.require('openils.User');
 dojo.require('openils.Event');
 dojo.require('openils.widget.OrgUnitFilteringSelect');
+dojo.require('openils.PermaCrud');
 
 var authtoken;
 var contextOrg;
 var user;
 var workOrgs;
+var osSettings = {};
 
 function osInit(data) {
     authtoken = dojo.cookie('ses') || new openils.CGI().param('ses');
@@ -42,6 +44,19 @@ function osInit(data) {
 dojo.addOnLoad(osInit);
 
 function osDraw() {
+    var types = new openils.PermaCrud({authtoken:authtoken}).retrieveAll('coust');
+
+    dojo.forEach(types, 
+        function(type) {
+            osSettings[type.name()] = {
+                label : type.label(),
+                desc : type.description(),
+                type : type.datatype(),
+                fm_class : type.fm_class()
+            }
+        }
+    );
+    
     var names = [];
     for(var key in osSettings)
         names.push(key);

diff --git a/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml b/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml
index e3f5c86..32367d6 100644 (file)
--- a/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml
@@ -26,182 +26,6 @@
         <script type="text/javascript" djConfig="parseOnLoad: true,isDebug:false" src="/js/dojo/dojo/dojo.js"></script>
  <script type="text/javascript" djConfig="parseOnLoad: true,isDebug:false" src="/js/dojo/dojo/openils_dojo.js"></script>
         <script type="text/javascript" src='org_unit_settings.js'></script>
-        <script>
-            // Configure the different settings
-            var osSettings = {
-                'circ.lost_materials_processing_fee' : {
-                    label : '&staff.server.admin.org_settings.lost_fee;',
-                    type : 'currency',
-                },
-                'cat.default_item_price' : {
-                    label : '&staff.server.admin.org_settings.default_price;',
-                    type : 'currency',
-                },
-                'auth.opac_timeout' : {
-                    label : '&staff.server.admin.org_settings.opac_timeout;',
-                    type : 'number',
-                },
-                'auth.staff_timeout' : {
-                    label : '&staff.server.admin.org_settings.staff_timeout;',
-                    type : 'number',
-                },
-                'org.bounced_emails' : {
-                    label : '&staff.server.admin.org_settings.from_address;',
-                    desc : '&staff.server.admin.org_settings.bounce_note;'
-                },
-                'circ.hold_expire_alert_interval' : {
-                    label : '&staff.server.admin.org_settings.circ.hold_expire_alert_interval;',
-                    desc : '&staff.server.admin.org_settings.circ.hold_expire_alert_interval.desc;',
-                },
-                'circ.hold_expire_interval' : {
-                    label : '&staff.server.admin.org_settings.circ.hold_expire_interval;',
-                    desc : '&staff.server.admin.org_settings.circ.hold_expire_interval.desc;',
-                },
-                'global.credit.allow' : {
-                    label : '&staff.server.admin.org_settings.global.credit.allow;',
-                    desc : '&staff.server.admin.org_settings.global.credit.allow.desc;',
-                    type : 'bool'
-                },
-                'global.default_locale' : {
-                    label : '&staff.server.admin.org_settings.global.default_locale;',
-                },
-                'circ.void_overdue_on_lost' : {
-                    label : '&staff.server.admin.org_settings.circ.void_overdue_on_lost;',
-                    type : 'bool'
-                },
-                'circ.hold_stalling.soft' : {
-                    label : '&staff.server.admin.org_settings.circ.hold_stalling.soft;',
-                    desc : '&staff.server.admin.org_settings.circ.hold_stalling.soft.desc;',
-                },
-                'circ.hold_boundary.hard' : {
-                    label : '&staff.server.admin.org_settings.circ.hold_boundary.hard;',
-                    type : 'number'
-                },
-                'circ.hold_boundary.soft' : {
-                    label : '&staff.server.admin.org_settings.circ.hold_boundary.soft;',
-                    type : 'number'
-                },
-                'opac.barcode_regex' : {
-                    label : '&staff.server.admin.org_settings.opac.barcode_regex;',
-                    desc : '&staff.server.admin.org_settings.opac.barcode_regex.desc;'
-                },
-                'global.password_regex' : {
-                    label : '&staff.server.admin.org_settings.global.password_regex;',
-                    desc : '&staff.server.admin.org_settings.global.password_regex.desc;'
-                },
-                'circ.item_checkout_history.max' : {
-                    label : '&staff.server.admin.org_settings.circ.item_checkout_history.max;',
-                    desc : '&staff.server.admin.org_settings.circ.item_checkout_history.max.desc;'
-                },
-                'circ.reshelving_complete.interval' : {
-                    label : '&staff.server.admin.org_settings.circ.reshelving_complete.interval;',
-                    desc : '&staff.server.admin.org_settings.circ.reshelving_complete.interval.desc;',
-                    noInherit : true
-                },
-                'circ.hold_estimate_wait_interval' : {
-                    label : '&staff.server.admin.org_settings.circ.hold_estimate_wait_interval;',
-                    desc : '&staff.server.admin.org_settings.circ.hold_estimate_wait_interval.desc;',
-                    type : 'number'
-                },
-                'circ.selfcheck.patron_login_timeout' : {
-                    label : '&staff.server.admin.org_settings.circ.selfcheck.patron_login_timeout;',
-                    desc : '&staff.server.admin.org_settings.circ.selfcheck.patron_login_timeout.desc;',
-                    type : 'number'
-                },
-                'circ.selfcheck.alert_on_checkout_event' : {
-                    label : '&staff.server.admin.org_settings.circ.selfcheck.alert_on_checkout_event;',
-                    desc : '&staff.server.admin.org_settings.circ.selfcheck.alert_on_checkout_event.desc;',
-                    type : 'bool'
-                },
-                'circ.selfcheck.require_patron_password' : {
-                    label : '&staff.server.admin.org_settings.circ.selfcheck.require_patron_password;',
-                    desc : '&staff.server.admin.org_settings.circ.selfcheck.require_patron_password.desc;',
-                    type : 'bool'
-                },
-                'global.juvenile_age_threshold' : {
-                    label : '&staff.server.admin.org_settings.global.juvenile_age_threshold;',
-                    desc : '&staff.server.admin.org_settings.global.juvenile_age_threshold.desc;',
-                },
-                'cat.bib.keep_on_empty' : {
-                    label : '&staff.server.admin.org_settings.cat.bib.keep_on_empty;',
-                    desc : '&staff.server.admin.org_settings.cat.bib.keep_on_empty.desc;',
-                    type : 'bool'
-                },
-                'cat.bib.alert_on_empty' : {
-                    label : '&staff.server.admin.org_settings.cat.bib.alert_on_empty;',
-                    desc : '&staff.server.admin.org_settings.cat.bib.alert_on_empty.desc;',
-                    type : 'bool'
-                },
-                'patron.password.use_phone' : {
-                    label : '&staff.server.admin.org_settings.patron.password.use_phone;',
-                    desc : '&staff.server.admin.org_settings.patron.password.use_phone.desc;',
-                    type : 'bool'
-                },
-                'ui.circ.patron_summary.horizontal' : {
-                    label : '&ui.circ.patron_summary.horizontal;',
-                    desc : '&ui.circ.patron_summary.horizontal.desc;',
-                    type : 'bool'
-                },
-                'ui.general.button_bar' : {
-                    label : '&ui.general.button_bar;',
-                    desc : '&ui.general.button_bar.desc;',
-                    type : 'bool'
-                },
-                'ui.network.progress_meter' : {
-                    label : '&ui.network.progress_meter;',
-                    desc : '&ui.network.progress_meter.desc;',
-                    type : 'bool'
-                },
-                'circ.charge_on_damaged' : {
-                    label : '&staff.server.admin.org_settings.circ.charge_on_damaged;',
-                    desc : '&staff.server.admin.org_settings.circ.charge_on_damaged.desc;',
-                    type : 'bool'
-                },
-                'circ.damaged_item_processing_fee' : {
-                    label : '&staff.server.admin.org_settings.circ.damaged_item_processing_fee;',
-                    desc : '&staff.server.admin.org_settings.circ.damaged_item_processing_fee.desc;',
-                },
-
-                'circ.void_lost_on_checkin' : {
-                    label : '&staff.server.admin.org_settings.circ.void_lost_on_checkin;',
-                    desc : '&staff.server.admin.org_settings.circ.void_lost_on_checkin.desc;',
-                    type : 'bool'
-                },
-                'circ.max_accept_return_of_lost' : {
-                    label : '&staff.server.admin.org_settings.circ.max_accept_return_of_lost;',
-                    desc : '&staff.server.admin.org_settings.circ.max_accept_return_of_lost.desc;',
-                },
-                'circ.void_lost_proc_fee_on_checkin' : {
-                    label : '&staff.server.admin.org_settings.circ.void_lost_proc_fee_on_checkin;',
-                    desc : '&staff.server.admin.org_settings.circ.void_lost_proc_fee_on_checkin.desc;',
-                    type : 'bool'
-                },
-                'circ.restore_overdue_on_lost_return' : {
-                    label : '&staff.server.admin.org_settings.circ.restore_overdue_on_lost_return;',
-                    desc : '&staff.server.admin.org_settings.circ.restore_overdue_on_lost_return.desc;',
-                    type : 'bool'
-                },
-                'circ.lost_immediately_available' : {
-                    label : '&staff.server.admin.org_settings.circ.lost_immediately_available;',
-                    desc : '&staff.server.admin.org_settings.circ.lost_immediately_available.desc;',
-                    type : 'bool'
-                },
-                'opac.allow_pending_address' : {
-                    label : '&staff.server.admin.org_settings.opac.allow_pending_address;',
-                    desc : '&staff.server.admin.org_settings.opac.allow_pending_address.desc;',
-                    type : 'bool'
-                },
-                'ui.circ.show_billing_tab_on_bills' : {
-                    label : '&staff.server.admin.org_settings.ui.circ.show_billing_tab_on_bills;',
-                    desc : '&staff.server.admin.org_settings.ui.circ.show_billing_tab_on_bills.desc;',
-                    type : 'bool'
-                },
-                'ui.circ.patron_display_timeout_interval' : {
-                    label : '&staff.server.admin.org_settings.ui.circ.patron_display_timeout_interval;',
-                    desc : '&staff.server.admin.org_settings.ui.circ.patron_display_timeout_interval.desc;',
-                }
-            };
-        </script>
     </head>
     <body class="tundra tall">
         <div dojoType="dijit.layout.LayoutContainer" orientation="vertical" class="tall">