fixed a description dtd. when we draw the edit dialog, load the existing setting...

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

diff --git a/Open-ILS/web/js/dojo/openils/User.js b/Open-ILS/web/js/dojo/openils/User.js
index ae0d1e1..87e75ff 100644 (file)
--- a/Open-ILS/web/js/dojo/openils/User.js
+++ b/Open-ILS/web/js/dojo/openils/User.js
@@ -233,7 +233,7 @@ if(!dojo._hasResource["openils.User"]) {
          * @param perm The permission to check
          * @param selector The pre-created dijit.form.FilteringSelect object.  
          */
-        buildPermOrgSelector : function(perm, selector) {
+        buildPermOrgSelector : function(perm, selector, selectedOrg) {
             var _u = this;
     
             dojo.require('dojo.data.ItemFileReadStore');
@@ -241,7 +241,10 @@ if(!dojo._hasResource["openils.User"]) {
             function hookupStore(store) {
                 selector.store = store;
                 selector.startup();
-                selector.setValue(_u.user.ws_ou());
+                if(selectedOrg != null)
+                    selector.setValue(selectedOrg);
+                else
+                    selector.setValue(_u.user.ws_ou());
             }
 
             function buildTreePicker(orgList) {

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 6f28684..23b6489 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
@@ -155,7 +155,7 @@ function osGetEditLink(rowIdx) {
 function osLaunchEditor(name) {
     osEditDialog._osattr = name;
     osEditDialog.show();
-    user.buildPermOrgSelector('UPDATE_ORG_UNIT_SETTING.' + name, osEditContextSelector);
+    user.buildPermOrgSelector('UPDATE_ORG_UNIT_SETTING.' + name, osEditContextSelector, osSettings[name].context);
     dojo.byId('os-edit-name').innerHTML = osSettings[name].label;
     dojo.byId('os-edit-desc').innerHTML = osSettings[name].desc || '';
 
@@ -164,19 +164,23 @@ function osLaunchEditor(name) {
     dojo.style(osEditNumberTextBox.domNode, 'display', 'none');
     dojo.style(osEditBoolSelect.domNode, 'display', 'none');
 
+    var widget;
     switch(osSettings[name].type) {
         case 'number':
-            dojo.style(osEditNumberTextBox.domNode, 'display', 'block');
+            widget = osEditNumberTextBox; 
             break;
         case 'currency':
-            dojo.style(osEditCurrencyTextBox.domNode, 'display', 'block');
+            widget = osEditCurrencyTextBox; 
             break;
         case 'bool':
-            dojo.style(osEditBoolSelect.domNode, 'display', 'block');
+            widget = osEditBoolSelect; 
             break;
         default:
-            dojo.style(osEditTextBox.domNode, 'display', 'block');
+            widget = osEditTextBox;
     }
+
+    dojo.style(widget.domNode, 'display', 'block');
+    widget.setValue(osSettings[name].value);
 }
 
 function osEditSetting(deleteMe) {

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 1048c5e..626d6ab 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
@@ -95,7 +95,7 @@
                 },
                 'circ.hold_estimate_wait_interval' : {
                     label : '&staff.server.admin.org_settings.circ.hold_estimate_wait_interval;',
-                    desc : '&staff.server.admin.org_settings.circ.circ.hold_estimate_wait_interval;',
+                    desc : '&staff.server.admin.org_settings.circ.hold_estimate_wait_interval.desc;',
                     type : 'number'
                 }
             };