[open-ils-commits] r18712 - in trunk/Open-ILS: web/conify/global/actor web/conify/global/config web/conify/global/permission web/js/dojo/fieldmapper web/js/ui web/opac/skin/default/xml/common web/templates xul/staff_client/server/OpenILS xul/staff_client/server/admin (erickson)
svn at svn.open-ils.org
svn at svn.open-ils.org
Fri Nov 12 08:56:00 EST 2010
Author: erickson
Date: 2010-11-12 08:55:58 -0500 (Fri, 12 Nov 2010)
New Revision: 18712
Modified:
trunk/Open-ILS/web/conify/global/actor/org_unit.html
trunk/Open-ILS/web/conify/global/actor/org_unit_type.html
trunk/Open-ILS/web/conify/global/config/copy_status.html
trunk/Open-ILS/web/conify/global/config/marc_code_maps.html
trunk/Open-ILS/web/conify/global/permission/grp_tree.html
trunk/Open-ILS/web/conify/global/permission/perm_list.html
trunk/Open-ILS/web/js/dojo/fieldmapper/Fieldmapper.js
trunk/Open-ILS/web/js/dojo/fieldmapper/IDL.js
trunk/Open-ILS/web/js/dojo/fieldmapper/OrgUtils.js
trunk/Open-ILS/web/js/dojo/fieldmapper/dojoData.js
trunk/Open-ILS/web/js/dojo/fieldmapper/hash.js
trunk/Open-ILS/web/js/ui/base.js
trunk/Open-ILS/web/opac/skin/default/xml/common/js_common.xml
trunk/Open-ILS/web/templates/base.tt2
trunk/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
trunk/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml
trunk/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml
Log:
Server-generated IDL JS
The goal is to reduce use of pre-onload XHR, which is known to cause
problems (dreaded white-screen-of-death) in firefox/xulrunner. Change
allows opac, staff client, and embedded browser interfaces to load
a pre-formatted JS object instead of IDL XML via XHR. In addition to
dropping the XHR, clients no longer parse the XML, which should reduce
page render time. Finally, in the staff interfaces, the full IDL is
once again loaded, so there is no need to specifiy per-page classes.
Per-page classes are still supported and used in the OPAC to reduce the
up-front load time.
Change requires an update to the Evergreen Apache config. See -r18700.
Part of this change included condensing fieldmapper.hash and
fielmapper.dojoData content into fieldmapper.Fieldmapper to avoid
circular dependencies, which was causing problems with IE. Will
eventually want to deprecate .hash and .dojoData, but for now they still
function as before.
Modified: trunk/Open-ILS/web/conify/global/actor/org_unit.html
===================================================================
--- trunk/Open-ILS/web/conify/global/actor/org_unit.html 2010-11-11 19:03:58 UTC (rev 18711)
+++ trunk/Open-ILS/web/conify/global/actor/org_unit.html 2010-11-12 13:55:58 UTC (rev 18712)
@@ -47,6 +47,7 @@
</style>
<!-- The OpenSRF API writ JS -->
+ <script language='javascript' src='/IDL2js' type='text/javascript'></script>
<script language='javascript' src='/opac/common/js/utils.js' type='text/javascript'></script>
<script language='javascript' src='/opac/common/js/CGI.js' type='text/javascript'></script>
<script language='javascript' src='/opac/common/js/JSON_v1.js' type='text/javascript'></script>
Modified: trunk/Open-ILS/web/conify/global/actor/org_unit_type.html
===================================================================
--- trunk/Open-ILS/web/conify/global/actor/org_unit_type.html 2010-11-11 19:03:58 UTC (rev 18711)
+++ trunk/Open-ILS/web/conify/global/actor/org_unit_type.html 2010-11-12 13:55:58 UTC (rev 18712)
@@ -49,6 +49,7 @@
</style>
<!-- The OpenSRF API writ JS -->
+ <script language='javascript' src='/IDL2js' type='text/javascript'></script>
<script language='javascript' src='/opac/common/js/utils.js' type='text/javascript'></script>
<script language='javascript' src='/opac/common/js/CGI.js' type='text/javascript'></script>
<script language='javascript' src='/opac/common/js/JSON_v1.js' type='text/javascript'></script>
@@ -381,7 +382,7 @@
{ parent : current_type, attribute : 'children' }
);
},
- }).send();
+ });
if (!err) {
highlighter.editor_pane.green.play();
Modified: trunk/Open-ILS/web/conify/global/config/copy_status.html
===================================================================
--- trunk/Open-ILS/web/conify/global/config/copy_status.html 2010-11-11 19:03:58 UTC (rev 18711)
+++ trunk/Open-ILS/web/conify/global/config/copy_status.html 2010-11-12 13:55:58 UTC (rev 18712)
@@ -50,6 +50,7 @@
</style>
<!-- The OpenSRF API writ JS -->
+ <script language='javascript' src='/IDL2js' type='text/javascript'></script>
<script language='javascript' src='/opac/common/js/utils.js' type='text/javascript'></script>
<script language='javascript' src='/opac/common/js/CGI.js' type='text/javascript'></script>
<script language='javascript' src='/opac/common/js/JSON_v1.js' type='text/javascript'></script>
Modified: trunk/Open-ILS/web/conify/global/config/marc_code_maps.html
===================================================================
--- trunk/Open-ILS/web/conify/global/config/marc_code_maps.html 2010-11-11 19:03:58 UTC (rev 18711)
+++ trunk/Open-ILS/web/conify/global/config/marc_code_maps.html 2010-11-12 13:55:58 UTC (rev 18712)
@@ -50,6 +50,7 @@
</style>
<!-- The OpenSRF API writ JS -->
+ <script language='javascript' src='/IDL2js' type='text/javascript'></script>
<script language='javascript' src='/opac/common/js/utils.js' type='text/javascript'></script>
<script language='javascript' src='/opac/common/js/CGI.js' type='text/javascript'></script>
<script language='javascript' src='/opac/common/js/JSON_v1.js' type='text/javascript'></script>
Modified: trunk/Open-ILS/web/conify/global/permission/grp_tree.html
===================================================================
--- trunk/Open-ILS/web/conify/global/permission/grp_tree.html 2010-11-11 19:03:58 UTC (rev 18711)
+++ trunk/Open-ILS/web/conify/global/permission/grp_tree.html 2010-11-12 13:55:58 UTC (rev 18712)
@@ -60,6 +60,7 @@
</style>
<!-- The OpenSRF API writ JS -->
+ <script language='javascript' src='/IDL2js' type='text/javascript'></script>
<script language='javascript' src='/opac/common/js/utils.js' type='text/javascript'></script>
<script language='javascript' src='/opac/common/js/CGI.js' type='text/javascript'></script>
<script language='javascript' src='/opac/common/js/JSON_v1.js' type='text/javascript'></script>
Modified: trunk/Open-ILS/web/conify/global/permission/perm_list.html
===================================================================
--- trunk/Open-ILS/web/conify/global/permission/perm_list.html 2010-11-11 19:03:58 UTC (rev 18711)
+++ trunk/Open-ILS/web/conify/global/permission/perm_list.html 2010-11-12 13:55:58 UTC (rev 18712)
@@ -50,6 +50,7 @@
</style>
<!-- The OpenSRF API writ JS -->
+ <script language='javascript' src='/IDL2js?au,aou,aout,pgt,ppl,ccs' type='text/javascript'></script>
<script language='javascript' src='/opac/common/js/utils.js' type='text/javascript'></script>
<script language='javascript' src='/opac/common/js/CGI.js' type='text/javascript'></script>
<script language='javascript' src='/opac/common/js/JSON_v1.js' type='text/javascript'></script>
@@ -58,6 +59,7 @@
<script type="text/javascript" src="/js/dojo/dojo/dojo.js" djConfig="parseOnLoad: true"></script>
<script type="text/javascript" src="/js/dojo/dojo/openils_dojo.js" djConfig="parseOnLoad: true"></script>
<script type="text/javascript" src="/js/dojo/dijit/dijit.js"></script>
+ <script language='javascript'>dojo.require('fieldmapper.AutoIDL')</script>
<script type="text/javascript" src="perm_list.js"></script>
Modified: trunk/Open-ILS/web/js/dojo/fieldmapper/Fieldmapper.js
===================================================================
--- trunk/Open-ILS/web/js/dojo/fieldmapper/Fieldmapper.js 2010-11-11 19:03:58 UTC (rev 18711)
+++ trunk/Open-ILS/web/js/dojo/fieldmapper/Fieldmapper.js 2010-11-12 13:55:58 UTC (rev 18712)
@@ -16,18 +16,18 @@
*/
if(!dojo._hasResource["fieldmapper.Fieldmapper"]){
+ dojo._hasResource["fieldmapper.Fieldmapper"] = true;
+ dojo.provide("fieldmapper.Fieldmapper");
+ dojo.require("DojoSRF");
+
+
/* generate fieldmapper javascript classes. This expects a global variable
called 'fmclasses' to be fleshed with the classes we need to build */
function FMEX(message) { this.message = message; }
FMEX.toString = function() { return "FieldmapperException: " + this.message + "\n"; }
-
- dojo._hasResource["fieldmapper.Fieldmapper"] = true;
- dojo.provide("fieldmapper.Fieldmapper");
- dojo.require("DojoSRF");
-
dojo.declare( "fieldmapper.Fieldmapper", null, {
constructor : function (initArray) {
@@ -88,17 +88,10 @@
}
return;
}
-
-
-/*
- isnew : function(n) { if(arguments.length == 1) this.a[0] =n; return this.a[0]; },
- ischanged : function(n) { if(arguments.length == 1) this.a[1] =n; return this.a[1]; },
- isdeleted : function(n) { if(arguments.length == 1) this.a[2] =n; return this.a[2]; }
-*/
-
});
+
fieldmapper.vivicateClass = function (cl) {
dojo.provide( cl );
dojo.declare( cl , fieldmapper.Fieldmapper, {
@@ -128,10 +121,13 @@
}
});
+
fieldmapper[cl] = window[cl]; // alias into place
- if (fieldmapper.IDL && fieldmapper.IDL.loaded) fieldmapper[cl].Identifier = fieldmapper.IDL.fmclasses[cl].pkey;
- if (dojo._hasResource['fieldmapper.dojoData'] && dojo.filter(['aou','aout','pgt'], function(x){return x == cl}).length == 0) {
+ if (fieldmapper.IDL && fieldmapper.IDL.loaded)
+ fieldmapper[cl].Identifier = fieldmapper.IDL.fmclasses[cl].pkey;
+
+ //if (dojo.filter(['aou','aout','pgt'], function(x){return x == cl}).length == 0) {
fieldmapper[cl].prototype.fromStoreItem = _fromStoreItem;
fieldmapper[cl].toStoreData = _toStoreData;
fieldmapper[cl].toStoreItem = _toStoreItem;
@@ -139,46 +135,11 @@
fieldmapper[cl].initStoreData = _initStoreData;
fieldmapper[cl].prototype.toHash = _toHash;
fieldmapper[cl].toHash = _toHash;
- }
-
+ fieldmapper[cl].prototype.fromHash = _fromHash;
+ fieldmapper[cl].fromHash = _fromHash;
+ //}
};
- if (!window.fmclasses) dojo.require("fieldmapper.fmall", true);
- for( var cl in fmclasses ) {
- fieldmapper.vivicateClass(cl);
- }
-
- // if we were NOT called by the IDL loader ...
- // XXX This is now deprecated in preference to fieldmapper.AutoIDL
- if ( !(fieldmapper.IDL && fieldmapper.IDL.loaded) ) {
-
- fieldmapper.cmsa.Identifier = 'alias';
- fieldmapper.cmc.Identifier = 'name';
- fieldmapper.i18n_l.Identifier = 'code';
- fieldmapper.ccpbt.Identifier = 'code';
- fieldmapper.ccnbt.Identifier = 'code';
- fieldmapper.cbrebt.Identifier = 'code';
- fieldmapper.cubt.Identifier = 'code';
- fieldmapper.ccm.Identifier = 'code';
- fieldmapper.cvrfm.Identifier = 'code';
- fieldmapper.clm.Identifier = 'code';
- fieldmapper.cam.Identifier = 'code';
- fieldmapper.cifm.Identifier = 'code';
- fieldmapper.citm.Identifier = 'code';
- fieldmapper.cblvl.Identifier = 'code';
- fieldmapper.clfm.Identifier = 'code';
- fieldmapper.mous.Identifier = 'usr';
- fieldmapper.moucs.Identifier = 'usr';
- fieldmapper.mucs.Identifier = 'usr';
- fieldmapper.mus.Identifier = 'usr';
- fieldmapper.rxbt.Identifier = 'xact';
- fieldmapper.rxpt.Identifier = 'xact';
- fieldmapper.cxt.Identifier = 'name';
- fieldmapper.amtr.Identifier = 'matchpoint';
- fieldmapper.coust.Identifier = 'name';
-
- }
-
fieldmapper._request = function ( meth, staff, params ) {
var ses = OpenSRF.CachedClientSession( meth[0] );
if (!ses) return null;
@@ -246,90 +207,179 @@
have a staff counterpart and should have ".staff" appended to the method
before the method is called when in XUL mode */
fieldmapper.OpenSRF.methods = {
- SEARCH_MRS : ['open-ils.search','open-ils.search.metabib.multiclass',true],
- SEARCH_RS : ['open-ils.search','open-ils.search.biblio.multiclass',true],
- SEARCH_MRS_QUERY : ['open-ils.search','open-ils.search.metabib.multiclass.query',true],
- SEARCH_RS_QUERY : ['open-ils.search','open-ils.search.biblio.multiclass.query',true],
- FETCH_SEARCH_RIDS : ['open-ils.search','open-ils.search.biblio.record.class.search',true],
- FETCH_MRMODS : ['open-ils.search','open-ils.search.biblio.metarecord.mods_slim.retrieve'],
- FETCH_MODS_FROM_COPY : ['open-ils.search','open-ils.search.biblio.mods_from_copy'],
- FETCH_MR_COPY_COUNTS : ['open-ils.search','open-ils.search.biblio.metarecord.copy_count',true],
- FETCH_RIDS : ['open-ils.search','open-ils.search.biblio.metarecord_to_records',true],
- FETCH_RMODS : ['open-ils.search','open-ils.search.biblio.record.mods_slim.retrieve'],
- FETCH_R_COPY_COUNTS : ['open-ils.search','open-ils.search.biblio.record.copy_count',true],
- FETCH_FLESHED_USER : ['open-ils.actor','open-ils.actor.user.fleshed.retrieve'],
- FETCH_SESSION : ['open-ils.auth','open-ils.auth.session.retrieve'],
- LOGIN_INIT : ['open-ils.auth','open-ils.auth.authenticate.init'],
- LOGIN_COMPLETE : ['open-ils.auth','open-ils.auth.authenticate.complete'],
- LOGIN_DELETE : ['open-ils.auth','open-ils.auth.session.delete'],
- FETCH_USER_PREFS : ['open-ils.actor','open-ils.actor.patron.settings.retrieve'],
- UPDATE_USER_PREFS : ['open-ils.actor','open-ils.actor.patron.settings.update'],
- FETCH_COPY_STATUSES : ['open-ils.search','open-ils.search.config.copy_status.retrieve.all'],
- FETCH_COPY_COUNTS_SUMMARY : ['open-ils.search','open-ils.search.biblio.copy_counts.summary.retrieve'],
- FETCH_MARC_HTML : ['open-ils.search','open-ils.search.biblio.record.html'],
- FETCH_CHECKED_OUT_SUM : ['open-ils.actor','open-ils.actor.user.checked_out'],
- FETCH_HOLDS : ['open-ils.circ','open-ils.circ.holds.retrieve'],
- FETCH_FINES_SUMMARY : ['open-ils.actor','open-ils.actor.user.fines.summary'],
- FETCH_TRANSACTIONS : ['open-ils.actor','open-ils.actor.user.transactions.have_charge.fleshed'],
- FETCH_MONEY_BILLING : ['open-ils.circ','open-ils.circ.money.billing.retrieve.all'],
- FETCH_CROSSREF : ['open-ils.search','open-ils.search.authority.crossref'],
- FETCH_CROSSREF_BATCH : ['open-ils.search','open-ils.search.authority.crossref.batch'],
- CREATE_HOLD : ['open-ils.circ','open-ils.circ.holds.create'],
- CREATE_HOLD_OVERRIDE : ['open-ils.circ','open-ils.circ.holds.create.override'],
- CANCEL_HOLD : ['open-ils.circ','open-ils.circ.hold.cancel'],
- UPDATE_USERNAME : ['open-ils.actor','open-ils.actor.user.username.update'],
- UPDATE_PASSWORD : ['open-ils.actor','open-ils.actor.user.password.update'],
- UPDATE_EMAIL : ['open-ils.actor','open-ils.actor.user.email.update'],
- RENEW_CIRC : ['open-ils.circ','open-ils.circ.renew'],
- CHECK_SPELL : ['open-ils.search','open-ils.search.spellcheck'],
- FETCH_REVIEWS : ['open-ils.search','open-ils.search.added_content.review.retrieve.all'],
- FETCH_TOC : ['open-ils.search','open-ils.search.added_content.toc.retrieve'],
- FETCH_ACONT_SUMMARY : ['open-ils.search','open-ils.search.added_content.summary.retrieve'],
- FETCH_USER_BYBARCODE : ['open-ils.actor','open-ils.actor.user.fleshed.retrieve_by_barcode'],
- FETCH_ADV_MARC_MRIDS : ['open-ils.search','open-ils.search.biblio.marc',true],
- FETCH_ADV_ISBN_RIDS : ['open-ils.search','open-ils.search.biblio.isbn'],
- FETCH_ADV_ISSN_RIDS : ['open-ils.search','open-ils.search.biblio.issn'],
- FETCH_ADV_TCN_RIDS : ['open-ils.search','open-ils.search.biblio.tcn'],
- FETCH_CNBROWSE : ['open-ils.search','open-ils.search.callnumber.browse'],
- FETCH_CONTAINERS : ['open-ils.actor','open-ils.actor.container.retrieve_by_class'],
- FETCH_CONTAINERS : ['open-ils.actor','open-ils.actor.container.retrieve_by_class'],
- CREATE_CONTAINER : ['open-ils.actor','open-ils.actor.container.create'],
- DELETE_CONTAINER : ['open-ils.actor','open-ils.actor.container.full_delete'],
- CREATE_CONTAINER_ITEM : ['open-ils.actor','open-ils.actor.container.item.create'],
- DELETE_CONTAINER_ITEM : ['open-ils.actor','open-ils.actor.container.item.delete'],
- FLESH_CONTAINER : ['open-ils.actor','open-ils.actor.container.flesh'],
- FLESH_PUBLIC_CONTAINER : ['open-ils.actor','open-ils.actor.container.public.flesh'],
- UPDATE_CONTAINER : ['open-ils.actor','open-ils.actor.container.update'],
- FETCH_COPY : ['open-ils.search','open-ils.search.asset.copy.retrieve'],
- FETCH_FLESHED_COPY : ['open-ils.search','open-ils.search.asset.copy.fleshed2.retrieve'],
- CHECK_HOLD_POSSIBLE : ['open-ils.circ','open-ils.circ.title_hold.is_possible'],
- UPDATE_HOLD : ['open-ils.circ','open-ils.circ.hold.update'],
- FETCH_COPIES_FROM_VOLUME : ['open-ils.search','open-ils.search.asset.copy.retrieve_by_cn_label',true],
- FETCH_VOLUME_BY_INFO : ['open-ils.search','open-ils.search.call_number.retrieve_by_info'], /* XXX staff method? */
- FETCH_VOLUME : ['open-ils.search','open-ils.search.asset.call_number.retrieve'],
- FETCH_COPY_LOCATIONS : ['open-ils.circ','open-ils.circ.copy_location.retrieve.all'],
- FETCH_COPY_NOTES : ['open-ils.circ','open-ils.circ.copy_note.retrieve.all'],
- FETCH_COPY_STAT_CATS : ['open-ils.circ','open-ils.circ.asset.stat_cat_entries.fleshed.retrieve_by_copy'],
- FETCH_LIT_FORMS : ['open-ils.search','open-ils.search.biblio.lit_form_map.retrieve.all'],
- FETCH_ITEM_FORMS : ['open-ils.search','open-ils.search.biblio.item_form_map.retrieve.all'],
- FETCH_ITEM_TYPES : ['open-ils.search','open-ils.search.biblio.item_type_map.retrieve.all'],
- FETCH_AUDIENCES : ['open-ils.search','open-ils.search.biblio.audience_map.retrieve.all'],
- FETCH_HOLD_STATUS : ['open-ils.circ','open-ils.circ.hold.status.retrieve'],
- FETCH_NON_CAT_CIRCS : ['open-ils.circ','open-ils.circ.open_non_cataloged_circulation.user'],
- FETCH_NON_CAT_CIRC : ['open-ils.circ','open-ils.circ.non_cataloged_circulation.retrieve'],
- FETCH_NON_CAT_TYPES : ['open-ils.circ','open-ils.circ.non_cat_types.retrieve.all'],
- FETCH_BRE : ['open-ils.search','open-ils.search.biblio.record_entry.slim.retrieve'],
- CHECK_USERNAME : ['open-ils.actor','open-ils.actor.username.exists'],
- FETCH_CIRC_BY_ID : ['open-ils.circ','open-ils.circ.retrieve'],
- FETCH_MR_DESCRIPTORS : ['open-ils.search','open-ils.search.metabib.record_to_descriptors'],
- FETCH_HIGHEST_PERM_ORG : ['open-ils.actor','open-ils.actor.user.perm.highest_org.batch'],
- FETCH_USER_NOTES : ['open-ils.actor','open-ils.actor.note.retrieve.all'],
FETCH_ORG_BY_SHORTNAME : ['open-ils.actor','open-ils.actor.org_unit.retrieve_by_shortname'],
- FETCH_BIB_ID_BY_BARCODE : ['open-ils.search','open-ils.search.bib_id.by_barcode'],
FETCH_ORG_SETTING : ['open-ils.actor','open-ils.actor.ou_setting.ancestor_default'],
FETCH_ORG_SETTING_BATCH : ['open-ils.actor','open-ils.actor.ou_setting.ancestor_default.batch']
};
+
+
+ //** FROM HASH **/
+ function _fromHash (_hash) {
+ for ( var i=0; i < this._fields.length; i++) {
+ if (_hash[this._fields[i]] != null)
+ this[this._fields[i]]( _hash[this._fields[i]] );
+ }
+ return this;
+ }
+ function _toHash (includeNulls, virtFields) {
+ var _hash = {};
+ for ( var i=0; i < this._fields.length; i++) {
+ if (includeNulls || this[this._fields[i]]() != null) {
+ if (this[this._fields[i]]() == null)
+ _hash[this._fields[i]] = null;
+ else
+ _hash[this._fields[i]] = '' + this[this._fields[i]]();
+ }
+ }
+
+ if (virtFields && virtFields.length > 0) {
+ for (var i = 0; i < virtFields.length; i++) {
+ if (!_hash[virtFields[i]])
+ _hash[virtFields[i]] = null;
+ }
+ }
+
+ return _hash;
+ }
+ //** FROM HASH **/
+
+
+ /** FROM dojoData **/
+ function _fromStoreItem (data) {
+ this.fromHash(data);
+
+ for (var i = 0; this._ignore_fields && i < this._ignore_fields.length; i++)
+ this[this._ignore_fields[i]](null);
+
+ for (var i = 0; this._fields && i < this._fields.length; i++) {
+ if (dojo.isArray( this[this._fields[i]]() ))
+ this[this._fields[i]]( this[this._fields[i]]()[0] );
+ }
+ return this;
+ }
+
+ function _initStoreData(label, params) {
+ if (!params) params = {};
+ if (!params.identifier) params.identifier = this.Identifier;
+ if (!label) label = params.label;
+ if (!label) label = params.identifier;
+ return { label : label, identifier : params.identifier, items : [] };
+ }
+
+ function _toStoreItem(fmObj, params) {
+ if (!params) params = {};
+ return fmObj.toHash(true, params.virtualFields);
+ }
+
+ function _toStoreData (list, label, params) {
+ if (!params) params = {};
+ var data = this.initStoreData(label, params);
+
+ for (var i = 0; list && i < list.length; i++) data.items.push( list[i].toHash(true, params.virtualFields) );
+
+ if (params.children && params.parent) {
+ var _hash_list = data.items;
+
+ var _find_root = {};
+ for (var i = 0; _hash_list && i < _hash_list.length; i++) {
+ _find_root[_hash_list[i][params.identifier]] = _hash_list[i];
+ }
+
+ var item_data = [];
+ for (var i = 0; _hash_list && i < _hash_list.length; i++) {
+ var obj = _hash_list[i]
+ obj[params.children] = [];
+
+ for (var j = 0; _hash_list && j < _hash_list.length; j++) {
+ var kid = _hash_list[j];
+ if (kid[params.parent] == obj[params.identifier]) {
+ obj[params.children].push( { _reference : kid[params.identifier] } );
+ kid._iskid = true;
+ if (_find_root[kid[params.identifier]]) delete _find_root[kid[params.identifier]];
+ }
+ }
+
+ item_data.push( obj );
+ }
+
+ for (var j in _find_root) {
+ _find_root[j]['_top'] = 'true';
+ if (!_find_root[j][params.parent])
+ _find_root[j]['_trueRoot'] = 'true';
+ }
+
+ data.items = item_data;
+ }
+
+ return data;
+ }
+ /** FROM dojoData **/
+
+
+
+ /** ! Begin code that executes on page parse */
+
+ if (!window.fmclasses) dojo.require("fieldmapper.fmall", true);
+ for( var cl in fmclasses ) {
+ fieldmapper.vivicateClass(cl);
+ }
+
+ // if we were NOT called by the IDL loader ...
+ // XXX This is now deprecated in preference to fieldmapper.AutoIDL
+ if ( !(fieldmapper.IDL && fieldmapper.IDL.loaded) ) {
+
+ fieldmapper.cmsa.Identifier = 'alias';
+ fieldmapper.cmc.Identifier = 'name';
+ fieldmapper.i18n_l.Identifier = 'code';
+ fieldmapper.ccpbt.Identifier = 'code';
+ fieldmapper.ccnbt.Identifier = 'code';
+ fieldmapper.cbrebt.Identifier = 'code';
+ fieldmapper.cubt.Identifier = 'code';
+ fieldmapper.ccm.Identifier = 'code';
+ fieldmapper.cvrfm.Identifier = 'code';
+ fieldmapper.clm.Identifier = 'code';
+ fieldmapper.cam.Identifier = 'code';
+ fieldmapper.cifm.Identifier = 'code';
+ fieldmapper.citm.Identifier = 'code';
+ fieldmapper.cblvl.Identifier = 'code';
+ fieldmapper.clfm.Identifier = 'code';
+ fieldmapper.mous.Identifier = 'usr';
+ fieldmapper.moucs.Identifier = 'usr';
+ fieldmapper.mucs.Identifier = 'usr';
+ fieldmapper.mus.Identifier = 'usr';
+ fieldmapper.rxbt.Identifier = 'xact';
+ fieldmapper.rxpt.Identifier = 'xact';
+ fieldmapper.cxt.Identifier = 'name';
+ fieldmapper.amtr.Identifier = 'matchpoint';
+ fieldmapper.coust.Identifier = 'name';
+
+ }
+
+
+ /** FROM dojoData **/
+ /* set up some known class attributes */
+ if (fieldmapper.aou) fieldmapper.aou.prototype._ignore_fields = ['children'];
+ if (fieldmapper.aout) fieldmapper.aout.prototype._ignore_fields = ['children'];
+ if (fieldmapper.pgt) fieldmapper.pgt.prototype._ignore_fields = ['children'];
+
+ fieldmapper.aou.toStoreData = function (list, label) {
+ if (!label) label = 'shortname';
+ return _toStoreData.call(this, list, label, { 'parent' : 'parent_ou', 'children' : 'children' });
+ }
+
+ fieldmapper.aout.toStoreData = function (list, label) {
+ if (!label) label = 'name';
+ return _toStoreData.call(this, list, label, { 'parent' : 'parent', 'children' : 'children' });
+ }
+
+ fieldmapper.pgt.toStoreData = function (list, label) {
+ if (!label) label = 'name';
+ return _toStoreData.call(this, list, label, { 'parent' : 'parent', 'children' : 'children' });
+ }
+ /** FROM dojoData **/
+
+
}
Modified: trunk/Open-ILS/web/js/dojo/fieldmapper/IDL.js
===================================================================
--- trunk/Open-ILS/web/js/dojo/fieldmapper/IDL.js 2010-11-11 19:03:58 UTC (rev 18711)
+++ trunk/Open-ILS/web/js/dojo/fieldmapper/IDL.js 2010-11-12 13:55:58 UTC (rev 18712)
@@ -1,4 +1,5 @@
if(!dojo._hasResource["fieldmapper.IDL"]) {
+ dojo._hasResource['fieldmapper.IDL'] = true;
dojo.require("DojoSRF");
dojo.provide("fieldmapper.IDL");
dojo.declare('fieldmapper.IDL', null, {
@@ -11,6 +12,26 @@
constructor : function(classlist) {
+ var preload = [];
+ if (window._preload_fieldmapper_IDL) {
+ if (!fieldmapper.IDL.fmclasses) fieldmapper.IDL.fmclasses = {};
+ if (!window.fmclasses) window.fmclasses = {};
+
+ for (var c in window._preload_fieldmapper_IDL) {
+ preload.push(c);
+ fieldmapper.IDL.fmclasses[c] = window._preload_fieldmapper_IDL[c];
+
+ window.fmclasses[c] = [];
+ dojo.forEach(fieldmapper.IDL.fmclasses[c].fields, function(obj){ window.fmclasses[c].push(obj.name) });
+
+ if (classlist && classlist.length)
+ classlist = dojo.filter(classlist, function(x){return x != c;});
+ }
+
+ fieldmapper.IDL.loaded = true;
+ window._preload_fieldmapper_IDL = null;
+ }
+
if(!fieldmapper.IDL.fmclasses || (classlist && classlist.length)) {
var idl_url = this._URL_PATH;
@@ -27,25 +48,32 @@
}
}
- var self = this;
- dojo.xhrGet({
- url : idl_url,
- handleAs : 'xml',
- sync : true,
- timeout : 10000,
- preventCache : true,
- load : function (response) {
- self._parse(response);
- fieldmapper.IDL.loaded = true;
- },
- error : function (response) {
- fieldmapper.IDL.loaded = false;
- dojo.require('fieldmapper.fmall', true);
- }
- });
+ if( !idl_url.match(/\?$/) ) { // make sure we have classes that need loading
+
+ console.log("Fetching classes from server at " + idl_url + ':' + classlist);
+
+ var self = this;
+ dojo.xhrGet({
+ url : idl_url,
+ handleAs : 'xml',
+ sync : true,
+ timeout : 10000,
+ load : function (response) {
+ self._parse(response);
+ fieldmapper.IDL.loaded = true;
+ },
+ error : function (response) {
+ fieldmapper.IDL.loaded = false;
+ dojo.require('fieldmapper.fmall', true);
+ }
+ });
+ }
}
dojo.require('fieldmapper.Fieldmapper');
+ if (preload.length)
+ dojo.forEach( classlist, function (c) { fieldmapper.vivicateClass(c); } );
+
if (classlist && classlist.length)
dojo.forEach( classlist, function (c) { fieldmapper.vivicateClass(c); } );
},
Modified: trunk/Open-ILS/web/js/dojo/fieldmapper/OrgUtils.js
===================================================================
--- trunk/Open-ILS/web/js/dojo/fieldmapper/OrgUtils.js 2010-11-11 19:03:58 UTC (rev 18711)
+++ trunk/Open-ILS/web/js/dojo/fieldmapper/OrgUtils.js 2010-11-12 13:55:58 UTC (rev 18712)
@@ -20,7 +20,6 @@
dojo._hasResource["fieldmapper.OrgUtils"] = true;
dojo.provide("fieldmapper.OrgUtils");
dojo.require("fieldmapper.Fieldmapper");
- dojo.require("fieldmapper.hash");
dojo.require("fieldmapper.OrgTree", true);
dojo.require("fieldmapper.OrgLasso", true);
Modified: trunk/Open-ILS/web/js/dojo/fieldmapper/dojoData.js
===================================================================
--- trunk/Open-ILS/web/js/dojo/fieldmapper/dojoData.js 2010-11-11 19:03:58 UTC (rev 18711)
+++ trunk/Open-ILS/web/js/dojo/fieldmapper/dojoData.js 2010-11-12 13:55:58 UTC (rev 18712)
@@ -19,111 +19,117 @@
dojo._hasResource['fieldmapper.dojoData'] = true;
dojo.provide('fieldmapper.dojoData');
- dojo.require('fieldmapper.Fieldmapper');
- dojo.require('fieldmapper.hash');
+ if(!dojo._hasResource["fieldmapper.Fieldmapper"]) {
- function _fromStoreItem (data) {
- this.fromHash(data);
+ /* XXX Content loaded in Fieldmapper */
+ /* XXX deprecate this file **/
- for (var i = 0; this._ignore_fields && i < this._ignore_fields.length; i++)
- this[this._ignore_fields[i]](null);
+ dojo.require('fieldmapper.Fieldmapper');
+ dojo.require('fieldmapper.hash');
- for (var i = 0; this._fields && i < this._fields.length; i++) {
- if (dojo.isArray( this[this._fields[i]]() ))
- this[this._fields[i]]( this[this._fields[i]]()[0] );
- }
- return this;
- }
+ function _fromStoreItem (data) {
+ this.fromHash(data);
- function _initStoreData(label, params) {
- if (!params) params = {};
- if (!params.identifier) params.identifier = this.Identifier;
- if (!label) label = params.label;
- if (!label) label = params.identifier;
- return { label : label, identifier : params.identifier, items : [] };
- }
+ for (var i = 0; this._ignore_fields && i < this._ignore_fields.length; i++)
+ this[this._ignore_fields[i]](null);
- function _toStoreItem(fmObj, params) {
- if (!params) params = {};
- return fmObj.toHash(true, params.virtualFields);
- }
+ for (var i = 0; this._fields && i < this._fields.length; i++) {
+ if (dojo.isArray( this[this._fields[i]]() ))
+ this[this._fields[i]]( this[this._fields[i]]()[0] );
+ }
+ return this;
+ }
- function _toStoreData (list, label, params) {
- if (!params) params = {};
- var data = this.initStoreData(label, params);
+ function _initStoreData(label, params) {
+ if (!params) params = {};
+ if (!params.identifier) params.identifier = this.Identifier;
+ if (!label) label = params.label;
+ if (!label) label = params.identifier;
+ return { label : label, identifier : params.identifier, items : [] };
+ }
- for (var i = 0; list && i < list.length; i++) data.items.push( list[i].toHash(true, params.virtualFields) );
+ function _toStoreItem(fmObj, params) {
+ if (!params) params = {};
+ return fmObj.toHash(true, params.virtualFields);
+ }
- if (params.children && params.parent) {
- var _hash_list = data.items;
+ function _toStoreData (list, label, params) {
+ if (!params) params = {};
+ var data = this.initStoreData(label, params);
- var _find_root = {};
- for (var i = 0; _hash_list && i < _hash_list.length; i++) {
- _find_root[_hash_list[i][params.identifier]] = _hash_list[i];
- }
+ for (var i = 0; list && i < list.length; i++) data.items.push( list[i].toHash(true, params.virtualFields) );
- var item_data = [];
- for (var i = 0; _hash_list && i < _hash_list.length; i++) {
- var obj = _hash_list[i]
- obj[params.children] = [];
+ if (params.children && params.parent) {
+ var _hash_list = data.items;
- for (var j = 0; _hash_list && j < _hash_list.length; j++) {
- var kid = _hash_list[j];
- if (kid[params.parent] == obj[params.identifier]) {
- obj[params.children].push( { _reference : kid[params.identifier] } );
- kid._iskid = true;
- if (_find_root[kid[params.identifier]]) delete _find_root[kid[params.identifier]];
- }
- }
+ var _find_root = {};
+ for (var i = 0; _hash_list && i < _hash_list.length; i++) {
+ _find_root[_hash_list[i][params.identifier]] = _hash_list[i];
+ }
- item_data.push( obj );
- }
+ var item_data = [];
+ for (var i = 0; _hash_list && i < _hash_list.length; i++) {
+ var obj = _hash_list[i]
+ obj[params.children] = [];
- for (var j in _find_root) {
- _find_root[j]['_top'] = 'true';
- if (!_find_root[j][params.parent])
- _find_root[j]['_trueRoot'] = 'true';
- }
+ for (var j = 0; _hash_list && j < _hash_list.length; j++) {
+ var kid = _hash_list[j];
+ if (kid[params.parent] == obj[params.identifier]) {
+ obj[params.children].push( { _reference : kid[params.identifier] } );
+ kid._iskid = true;
+ if (_find_root[kid[params.identifier]]) delete _find_root[kid[params.identifier]];
+ }
+ }
- data.items = item_data;
- }
+ item_data.push( obj );
+ }
- return data;
- }
+ for (var j in _find_root) {
+ _find_root[j]['_top'] = 'true';
+ if (!_find_root[j][params.parent])
+ _find_root[j]['_trueRoot'] = 'true';
+ }
- for (var i in fmclasses) {
- fieldmapper[i].prototype.fromStoreItem = _fromStoreItem;
- fieldmapper[i].toStoreData = _toStoreData;
- fieldmapper[i].toStoreItem = _toStoreItem;
- fieldmapper[i].prototype.toStoreItem = function ( args ) { return _toStoreItem(this, args) };
- fieldmapper[i].initStoreData = _initStoreData;
- }
+ data.items = item_data;
+ }
- if (fieldmapper.aou) fieldmapper.aou.prototype._ignore_fields = ['children'];
- if (fieldmapper.aout) fieldmapper.aout.prototype._ignore_fields = ['children'];
- if (fieldmapper.pgt) fieldmapper.pgt.prototype._ignore_fields = ['children'];
+ return data;
+ }
- fieldmapper.aou.toStoreData = function (list, label) {
- if (!label) label = 'shortname';
- return _toStoreData.call(this, list, label, { 'parent' : 'parent_ou', 'children' : 'children' });
- }
+ for (var i in fmclasses) {
+ fieldmapper[i].prototype.fromStoreItem = _fromStoreItem;
+ fieldmapper[i].toStoreData = _toStoreData;
+ fieldmapper[i].toStoreItem = _toStoreItem;
+ fieldmapper[i].prototype.toStoreItem = function ( args ) { return _toStoreItem(this, args) };
+ fieldmapper[i].initStoreData = _initStoreData;
+ }
- fieldmapper.aout.toStoreData = function (list, label) {
- if (!label) label = 'name';
- return _toStoreData.call(this, list, label, { 'parent' : 'parent', 'children' : 'children' });
- }
+ if (fieldmapper.aou) fieldmapper.aou.prototype._ignore_fields = ['children'];
+ if (fieldmapper.aout) fieldmapper.aout.prototype._ignore_fields = ['children'];
+ if (fieldmapper.pgt) fieldmapper.pgt.prototype._ignore_fields = ['children'];
- fieldmapper.pgt.toStoreData = function (list, label) {
- if (!label) label = 'name';
- return _toStoreData.call(this, list, label, { 'parent' : 'parent', 'children' : 'children' });
- }
+ fieldmapper.aou.toStoreData = function (list, label) {
+ if (!label) label = 'shortname';
+ return _toStoreData.call(this, list, label, { 'parent' : 'parent_ou', 'children' : 'children' });
+ }
- /*
- ppl.toStoreData = function (list, label) {
- if (!label) label = 'code';
- return _toStoreData(list, label, {});
- }
- */
+ fieldmapper.aout.toStoreData = function (list, label) {
+ if (!label) label = 'name';
+ return _toStoreData.call(this, list, label, { 'parent' : 'parent', 'children' : 'children' });
+ }
+ fieldmapper.pgt.toStoreData = function (list, label) {
+ if (!label) label = 'name';
+ return _toStoreData.call(this, list, label, { 'parent' : 'parent', 'children' : 'children' });
+ }
+
+ /*
+ ppl.toStoreData = function (list, label) {
+ if (!label) label = 'code';
+ return _toStoreData(list, label, {});
+ }
+ */
+
+ }
}
Modified: trunk/Open-ILS/web/js/dojo/fieldmapper/hash.js
===================================================================
--- trunk/Open-ILS/web/js/dojo/fieldmapper/hash.js 2010-11-11 19:03:58 UTC (rev 18711)
+++ trunk/Open-ILS/web/js/dojo/fieldmapper/hash.js 2010-11-12 13:55:58 UTC (rev 18712)
@@ -19,40 +19,44 @@
dojo._hasResource['fieldmapper.hash'] = true;
dojo.provide('fieldmapper.hash');
- dojo.require('fieldmapper.Fieldmapper');
- function _fromHash (_hash) {
- for ( var i=0; i < this._fields.length; i++) {
- if (_hash[this._fields[i]] != null)
- this[this._fields[i]]( _hash[this._fields[i]] );
- }
- return this;
- }
+ if(!dojo._hasResource["fieldmapper.Fieldmapper"]) {
- function _toHash (includeNulls, virtFields) {
- var _hash = {};
- for ( var i=0; i < this._fields.length; i++) {
- if (includeNulls || this[this._fields[i]]() != null) {
- if (this[this._fields[i]]() == null)
- _hash[this._fields[i]] = null;
- else
- _hash[this._fields[i]] = '' + this[this._fields[i]]();
+ /* XXX Content loaded in Fieldmapper */
+ /* XXX deprecate this file **/
+
+ function _fromHash (_hash) {
+ for ( var i=0; i < this._fields.length; i++) {
+ if (_hash[this._fields[i]] != null)
+ this[this._fields[i]]( _hash[this._fields[i]] );
}
- }
+ return this;
+ }
- if (virtFields && virtFields.length > 0) {
- for (var i = 0; i < virtFields.length; i++) {
- if (!_hash[virtFields[i]])
- _hash[virtFields[i]] = null;
- }
- }
+ function _toHash (includeNulls, virtFields) {
+ var _hash = {};
+ for ( var i=0; i < this._fields.length; i++) {
+ if (includeNulls || this[this._fields[i]]() != null) {
+ if (this[this._fields[i]]() == null)
+ _hash[this._fields[i]] = null;
+ else
+ _hash[this._fields[i]] = '' + this[this._fields[i]]();
+ }
+ }
- return _hash;
- }
+ if (virtFields && virtFields.length > 0) {
+ for (var i = 0; i < virtFields.length; i++) {
+ if (!_hash[virtFields[i]])
+ _hash[virtFields[i]] = null;
+ }
+ }
- for (var i in fmclasses) {
- window[i].prototype.fromHash = _fromHash;
- window[i].prototype.toHash = _toHash;
- }
+ return _hash;
+ }
+ for (var i in fmclasses) {
+ window[i].prototype.fromHash = _fromHash;
+ window[i].prototype.toHash = _toHash;
+ }
+ }
}
Modified: trunk/Open-ILS/web/js/ui/base.js
===================================================================
--- trunk/Open-ILS/web/js/ui/base.js 2010-11-11 19:03:58 UTC (rev 18711)
+++ trunk/Open-ILS/web/js/ui/base.js 2010-11-12 13:55:58 UTC (rev 18712)
@@ -1,7 +1,6 @@
dojo.require('dijit.Dialog');
dojo.require('dojo.cookie');
dojo.require('fieldmapper.AutoIDL'); // make conditional. TT variable sets JS var to enable/disable?
-dojo.require('fieldmapper.dojoData');
dojo.require('openils.User');
dojo.require('openils.CGI');
dojo.require('openils.Event');
Modified: trunk/Open-ILS/web/opac/skin/default/xml/common/js_common.xml
===================================================================
--- trunk/Open-ILS/web/opac/skin/default/xml/common/js_common.xml 2010-11-11 19:03:58 UTC (rev 18711)
+++ trunk/Open-ILS/web/opac/skin/default/xml/common/js_common.xml 2010-11-12 13:55:58 UTC (rev 18712)
@@ -1,3 +1,9 @@
+
+ <!-- Initial list of classes cover home, results, and advanced search. -->
+ <script language='javascript'
+ src='/IDL2js?mvr,bre,aou,aout,pgt,lasso,cmf,cmc,cmsa,cam,cifm,clfm,citm,cblvl'
+ type='text/javascript'></script>
+
<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/utils.js' type='text/javascript'></script>
<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/config.js' type='text/javascript'></script>
<script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/CGI.js' type='text/javascript'></script>
@@ -44,9 +50,8 @@
var djConfig = {
locale: locale.toLowerCase(),
- AutoIDL: ['aou','aout','pgt','lasso'],
parseOnLoad: true,
- isDebug: false
+ isDebug: false
}, lang, bidi;
</script>
Modified: trunk/Open-ILS/web/templates/base.tt2
===================================================================
--- trunk/Open-ILS/web/templates/base.tt2 2010-11-11 19:03:58 UTC (rev 18711)
+++ trunk/Open-ILS/web/templates/base.tt2 2010-11-12 13:55:58 UTC (rev 18712)
@@ -10,19 +10,8 @@
href='[% ctx.media_prefix %]/css/skin/[% ctx.skin %].css' />
<link rel='stylesheet' type='text/css'
href='[% ctx.media_prefix %]/css/theme/[% ctx.skin %].css' />
- <script type="text/javascript">
-var djConfig = {parseOnLoad:true,isDebug:false,AutoIDL:[
-'aou','aout','pgt','lasso','mvr','acp','circ','ccmcmt','asvq','asva','asv','acplo','acqf','acqdfe',
-'vmp','cbs','viiad','vqarad','vqbr','vqbrad','aoa','ac','aua','asvr','actscecm','acqim','acqct','acqexr',
-'acqpro','acqpron','acqipm','acqinv','acqie','acqii','acqpa','acqpc','acqpca','acqftr','acqfc','acqfy','acqfs',
-'acqfscred','acqofscred','acqfdeb','acqf','acqfat','acqfdt','acqfet','acqfst','acqfcb','acqafat','acqafet',
-'acqafst','acqafsb','acqafcb','acqfsrcct','acqfsrcat','acqfsrcb','acqfsb','acqfa','acqfap','acqpl','acqcr',
-'acqpo','acqpoh','acqpon','acqpoi','acqlih','acqliat','acqlin','acqlia','acqlid','acqliad','acqlimad','pgpt',
-'acqligad','acqliuad','acqlipad','acqphsm','acqlilad','acqedi','acqedim','acqdf','acqdfe','acqdfa','acqda','cnal',
-'acqclt','acqclet','acqcl','acqcle','acqscl','acqscle','acqclp','acqclpa','acqlisum','acqft','acqftm','actsce','actscecm',
-'jub','sdist','ssub','sstr','scap','bre','siss','act', 'acpl', 'ccm', 'aiit', 'atevdef', 'ath', 'atreact','atclean','atenv','atevparam','atcol','actsc','cit',
-'atval','crahp','crmf','crrf','crcd','cust','coust','cgf','czs','cbt','csp','brt','brsrc','bra','bram','brav','vaq','vbq','vqar','ccmm','ccmcmtm','citm','cifm','cvrfm','chmm','chdd','chddv']};
- </script>
+ <script language='javascript' src='/IDL2js' type='text/javascript'></script>
+ <script type="text/javascript">var djConfig = {parseOnLoad:true,isDebug:false};</script>
<script type="text/javascript" src="[% ctx.media_prefix %]/js/dojo/dojo/dojo.js"></script>
<script type="text/javascript" src="[% ctx.media_prefix %]/js/dojo/dojo/openils_dojo.js"></script>
<script type="text/javascript" src="[% ctx.media_prefix %]/js/dojo/opensrf/md5.js"></script>
Modified: trunk/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul 2010-11-11 19:03:58 UTC (rev 18711)
+++ trunk/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul 2010-11-12 13:55:58 UTC (rev 18712)
@@ -9,6 +9,7 @@
<script>dump('starting openils_util_overlay in ' + location.href + '\n');</script>
<script>var djConfig = { 'baseUrl' : '/js/dojo/dojo/',parseOnLoad: true,isDebug:false };</script>
<script type="text/javascript" src="/js/dojo/dojo/dojo.js" />
+ <script type="text/javascript" src="/IDL2js" />
<script>try { dojo.require('fieldmapper.AutoIDL'); } catch(E) { alert(E); }</script>
<script>try { dojo.require('dojo.date.locale'); } catch(E) { alert(E); }</script>
<script>try { dojo.require('dojo.date.stamp'); } catch(E) { alert(E); }</script>
Modified: trunk/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml 2010-11-11 19:03:58 UTC (rev 18711)
+++ trunk/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml 2010-11-12 13:55:58 UTC (rev 18712)
@@ -10,6 +10,7 @@
<head>
<title>&staff.server.admin.copy_locations.title;</title>
+ <script type="text/javascript" src='/IDL2js?aou,aout,pgt,au,acpl'></script>
<script type="text/javascript" djConfig="parseOnLoad: true,isDebug:false" src="/js/dojo/dojo/dojo.js"></script>
<script type="text/javascript" djConfig="parseOnLoad: true,isDebug:false" src="/js/dojo/dojo/openils_dojo.js"></script>
<script type="text/javascript">
Modified: trunk/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml 2010-11-11 19:03:58 UTC (rev 18711)
+++ trunk/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml 2010-11-12 13:55:58 UTC (rev 18712)
@@ -23,8 +23,9 @@
<head>
<title>&staff.server.admin.org_unit_settings.title;</title>
<link type='text/css' rel='stylesheet' href='admin.css'/>
+ <script type="text/javascript" src='/IDL2js?aou,aout,pgt,au,coust,aous'></script>
<script type="text/javascript" djConfig="parseOnLoad: true,isDebug:false" src="/js/dojo/dojo/dojo.js"></script>
- <script type="text/javascript" djConfig="parseOnLoad: true,isDebug:false" src="/js/dojo/dojo/openils_dojo.js"></script>
+ <script type="text/javascript" djConfig="parseOnLoad: true,isDebug:false" src="/js/dojo/dojo/openils_dojo.js"></script>
<script type="text/javascript" src='org_unit_settings.js'></script>
</head>
<body class="tundra tall">
More information about the open-ils-commits
mailing list