From cace002d4be25c133e91511bc67da9a70b36958d Mon Sep 17 00:00:00 2001 From: miker Date: Tue, 1 Apr 2008 11:59:05 +0000 Subject: [PATCH] now org_unit is happy git-svn-id: svn://svn.open-ils.org/ILS/branches/dojo-admin@9173 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/web/conify/global/actor/org_unit.html | 64 +++++++++++++------------- Open-ILS/web/conify/global/actor/org_unit.js | 2 +- Open-ILS/web/conify/js/fieldmapper/dojoData.js | 1 + 3 files changed, 35 insertions(+), 32 deletions(-) diff --git a/Open-ILS/web/conify/global/actor/org_unit.html b/Open-ILS/web/conify/global/actor/org_unit.html index 53c1b1b080..493754a541 100644 --- a/Open-ILS/web/conify/global/actor/org_unit.html +++ b/Open-ILS/web/conify/global/actor/org_unit.html @@ -60,7 +60,7 @@ pCRUD.request({ method : 'open-ils.permacrud.search.aou.atomic', - timeout : 10, + timeout : 15, params : [ ses, { id : { "!=" : null } }, { order_by : { aou : 'shortname' } } ], onerror : function (r) { throw 'Problem fetching org units';}, oncomplete : function (r) { @@ -104,7 +104,7 @@ pCRUD.request({ method : 'open-ils.permacrud.search.aout.atomic', timeout : 10, - params : [ ses, { id : { "!=" : null } }, { order_by : { aout : 'name' } } ], + params : [ ses, { id : { "!=" : null } }, { order_by : { aout : 'depth' } } ], onerror : function (r) { status_update('Problem fetching types') }, oncomplete : function (r) { window._ou_type_list = r.recv().content(); @@ -113,6 +113,22 @@ } }).send(); + highlighter.ou_tree = {}; + highlighter.editor_pane = {}; + highlighter.hoo_pane = {}; + highlighter.addresses_pane = {}; + + highlighter.ou_tree.green = dojox.fx.highlight( { color : '#B4FFB4', node : 'ou_tree', duration : 500 } ); + highlighter.ou_tree.red = dojox.fx.highlight( { color : '#FF2018', node : 'ou_tree', duration : 500 } ); + + highlighter.editor_pane.green = dojox.fx.highlight( { color : '#B4FFB4', node : 'editor_pane', duration : 500 } ); + highlighter.editor_pane.red = dojox.fx.highlight( { color : '#FF2018', node : 'editor_pane', duration : 500 } ); + + highlighter.hoo_pane.green = dojox.fx.highlight( { color : '#B4FFB4', node : 'hoo_pane', duration : 500 } ); + highlighter.hoo_pane.red = dojox.fx.highlight( { color : '#FF2018', node : 'hoo_pane', duration : 500 } ); + + highlighter.addresses_pane.green = dojox.fx.highlight( { color : '#B4FFB4', node : 'addresses_pane', duration : 500 } ); + highlighter.addresses_pane.red = dojox.fx.highlight( { color : '#FF2018', node : 'addresses_pane', duration : 500 } );
- - + @@ -437,38 +439,38 @@
Org Unit Name
- - + + - - + + - - + + - - + + - - + + - - + + - - + +
Open timeClose time
Monday
Tuesday
Wednesday
Thursday
Friday
Saturday
Sunday
diff --git a/Open-ILS/web/conify/global/actor/org_unit.js b/Open-ILS/web/conify/global/actor/org_unit.js index 5e9ee403cb..5ea49c5543 100644 --- a/Open-ILS/web/conify/global/actor/org_unit.js +++ b/Open-ILS/web/conify/global/actor/org_unit.js @@ -29,7 +29,7 @@ var virgin_ou_id = -1; var highlighter = {}; function status_update (markup) { - if (parent.status_update) parent.status_update( markup ); + if (parent !== window && parent.status_update) parent.status_update( markup ); } function save_org () { diff --git a/Open-ILS/web/conify/js/fieldmapper/dojoData.js b/Open-ILS/web/conify/js/fieldmapper/dojoData.js index c99062d488..7d2a128caf 100644 --- a/Open-ILS/web/conify/js/fieldmapper/dojoData.js +++ b/Open-ILS/web/conify/js/fieldmapper/dojoData.js @@ -22,6 +22,7 @@ if(!dojo._hasResource['fieldmapper.dojoData']){ function _toStoreData (list, label, params) { if (!params) params = {}; + if (!list) list = {}; // a sane default if (!params.identifier) params.identifier = 'id'; -- 2.11.0