From 9bc32a7f257fc68f79bc3fd6004fda799f8697d7 Mon Sep 17 00:00:00 2001 From: Joseph Lewis Date: Tue, 7 Jun 2011 11:34:20 -0600 Subject: [PATCH] Added Tags support in the org_unit_settings display page. Signed-off-by: Joseph Lewis Signed-off-by: Thomas Berezansky Signed-off-by: Jason Etheridge --- Open-ILS/xul/staff_client/server/admin/org_unit_settings.js | 9 +++++++-- Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml | 4 +++- 2 files changed, 10 insertions(+), 3 deletions(-) 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 31a6a4a418..696c8e7659 100644 --- a/Open-ILS/xul/staff_client/server/admin/org_unit_settings.js +++ b/Open-ILS/xul/staff_client/server/admin/org_unit_settings.js @@ -23,13 +23,18 @@ var osSettings = {}; var ouSettingValues = {}; var osEditAutoWidget; var perm_codes = {}; +var osGroups = {}; function osInit(data) { authtoken = new openils.CGI().param('ses') || dojo.cookie('ses'); user = new openils.User({authtoken:authtoken}); contextOrg = user.user.ws_ou(); openils.User.authtoken = authtoken; + + var grps = new openils.PermaCrud({authtoken:authtoken}).retrieveAll('csg'); + dojo.forEach(grps, function(grp) { osGroups[grp.name()] = grp.label(); }); + var connect = function() { dojo.connect(contextOrg, 'onChange', osChangeContext); @@ -71,7 +76,6 @@ function osDraw(specific_setting) { names.push(key); } else { - var types = new openils.PermaCrud({authtoken:authtoken}).retrieveAll('coust'); dojo.forEach(types, @@ -81,7 +85,8 @@ function osDraw(specific_setting) { desc : type.description(), type : type.datatype(), fm_class : type.fm_class(), - update_perm : type.update_perm() + update_perm : type.update_perm(), + grp : osGroups[type.grp()] } } ); 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 017ab39afb..16cdabf2cc 100644 --- a/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml +++ b/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml @@ -23,7 +23,7 @@ &staff.server.admin.org_unit_settings.title; - + @@ -53,6 +53,7 @@ get: osGetEditLink, formatter : osFormatEditLink }, + {name: 'Group', get: osGetGridData, field:'grp'}, {name: 'Setting', get: osGetGridData, field:'label', width:'auto', styles:'text-align:left;'}, {name: 'Context', get: osGetGridData, field:'context'}, {name: 'Value', get: osGetGridData, field:'value', width:'auto'}, @@ -106,6 +107,7 @@
+ -- 2.11.0