From 6cf9aa9ae22fde85b17a9950e5697e48612819dc Mon Sep 17 00:00:00 2001 From: miker Date: Thu, 24 Jul 2008 15:04:05 +0000 Subject: [PATCH 1/1] backporting virtual field support from acq branch git-svn-id: svn://svn.open-ils.org/ILS/trunk@10112 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/web/js/dojo/fieldmapper/dojoData.js | 2 +- Open-ILS/web/js/dojo/fieldmapper/hash.js | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Open-ILS/web/js/dojo/fieldmapper/dojoData.js b/Open-ILS/web/js/dojo/fieldmapper/dojoData.js index a0ab494c9a..3e5a1ad1af 100644 --- a/Open-ILS/web/js/dojo/fieldmapper/dojoData.js +++ b/Open-ILS/web/js/dojo/fieldmapper/dojoData.js @@ -48,7 +48,7 @@ if(!dojo._hasResource['fieldmapper.dojoData']){ var data = { label : label, identifier : params.identifier, items : [] }; - for (var i in list) data.items.push( list[i].toHash(true) ); + for (var i in list) data.items.push( list[i].toHash(true, params.virtualFields) ); if (params.children && params.parent) { var _hash_list = data.items; diff --git a/Open-ILS/web/js/dojo/fieldmapper/hash.js b/Open-ILS/web/js/dojo/fieldmapper/hash.js index 333a2d90b9..d3a62568c6 100644 --- a/Open-ILS/web/js/dojo/fieldmapper/hash.js +++ b/Open-ILS/web/js/dojo/fieldmapper/hash.js @@ -29,7 +29,7 @@ if(!dojo._hasResource['fieldmapper.hash']){ return this; } - function _toHash (includeNulls) { + function _toHash (includeNulls, virtFields) { var _hash = {}; for ( var i=0; i < this._fields.length; i++) { if (includeNulls || this[this._fields[i]]() != null) { @@ -39,6 +39,14 @@ if(!dojo._hasResource['fieldmapper.hash']){ _hash[this._fields[i]] = '' + this[this._fields[i]](); } } + + if (virtFields && virtFields.length > 0) { + for (var i in virtFields) { + if (!_hash[virtFields[i]]) + _hash[virtFields[i]] = null; + } + } + return _hash; } -- 2.43.2