Connector Settings Editor menu fixes
authormiker <miker@c09e901b-359b-4c48-93b1-c7450cb1b5b7>
Wed, 16 May 2012 15:54:34 +0000 (15:54 +0000)
committerBill Erickson <berick@esilibrary.com>
Fri, 30 May 2014 15:10:48 +0000 (11:10 -0400)
git-svn-id: svn://fulfillment-ill.org/FulfILLment/trunk@386 c09e901b-359b-4c48-93b1-c7450cb1b5b7

Signed-off-by: Bill Erickson <berick@esilibrary.com>

Open-ILS/xul/staff_client/chrome/content/main/menu.js
Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
Open-ILS/xul/staff_client/server/admin/org_unit_settings.js

index 86fd9a7..0fedd53 100644 (file)
@@ -185,7 +185,7 @@ main.menu.prototype = {
                                        } else {
                                                loc += window.escape('&');
                                        }
-                                       loc += window.escape(i + '=' + params[i]);
+                                       loc += window.escape(i + '=' + window.escape(params[i]));
                                }
                        }
 
index c68920a..c8c15fc 100644 (file)
              perm="CREATE_COPY_LOCATION UPDATE_COPY_LOCATION DELETE_COPY_LOCATION"
              />
     <command id="cmd_local_admin_lib_settings" />
+    <command id="cmd_local_admin_connector_settings"/>
     <command id="cmd_local_admin_non_cat_types" 
              perm="CREATE_NON_CAT_TYPE UPDATE_NON_CAT_TYPE DELETE_NON_CAT_TYPE"
              />
     <command id="cmd_local_admin_search_filter_group"
              perm="ADMIN_SEARCH_FILTER_GROUP VIEW_SEARCH_FILTER_GROUP"
              />
-
     <!-- server admin menu commands -->
     <command id="cmd_server_admin_org_type"
              perm="CREATE_ORG_TYPE DELETE_ORG_TYPE UPDATE_ORG_TYPE"
index 5530e29..bdeb49f 100644 (file)
@@ -49,7 +49,7 @@ function osInit(data) {
     contextOrg = user.user.ws_ou();
     openils.User.authtoken = authtoken;
     
-    if (tf) type_filter = { name : { like : type_filter } };
+    if (tf) type_filter = { name : { like : tf } };
     else type_filter = { name : { '!=' : null } };
 
     pcrud = new openils.PermaCrud({authtoken:authtoken});
@@ -108,8 +108,10 @@ function osDraw(specific_setting) {
     var names = [];
     if (specific_setting) {
 
-        for(var key in specific_setting)
+        for(var key in specific_setting) {
+            if (!osSettings[key]) continue;
             names.push(key);
+        }
 
     } else {
         var types = new openils.PermaCrud({authtoken:authtoken}).search('coust', type_filter);
@@ -283,8 +285,10 @@ function osDrawNames(names) {
                 var data = r.recv().content();
                 if(e = openils.Event.parse(data))
                     return alert(e);
-                for(var key in data)
+                for(var key in data) {
+                    if (!osSettings[key]) continue;
                     ouSettingValues[key] = data[key];
+                }
                 osLoadGrid(ouSettingValues);
                 
                 showProcessingDialog(false);