From 7d207eb26985eeb910acaf7be25e1582d675c52f Mon Sep 17 00:00:00 2001 From: senator Date: Tue, 15 Jun 2010 21:50:15 +0000 Subject: [PATCH] Acq: misc minor bugfixes to various admin interfaces that didn't load consistently. Also a little more menu re-org. git-svn-id: svn://svn.open-ils.org/ILS/trunk@16725 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../acq/financial/list_funding_sources.js | 9 ++++++--- .../acq/financial/view_funding_source.js | 10 ++++++++-- .../conify/global/acq/distribution_formula.js | 5 ++++- .../default/conify/global/acq/edi_account.js | 10 ++++++---- Open-ILS/web/opac/locale/en-US/lang.dtd | 12 ++++++------ .../default/acq/financial/list_funds.tt2 | 1 - .../acq/financial/view_funding_source.tt2 | 2 +- .../conify/global/acq/distribution_formula.tt2 | 1 - .../default/conify/global/acq/edi_account.tt2 | 1 - .../default/conify/global/acq/fund_tag.tt2 | 1 - .../default/conify/global/acq/provider.tt2 | 1 - .../chrome/content/main/menu_frame_menus.xul | 18 +++++++++--------- 12 files changed, 40 insertions(+), 31 deletions(-) diff --git a/Open-ILS/web/js/ui/default/acq/financial/list_funding_sources.js b/Open-ILS/web/js/ui/default/acq/financial/list_funding_sources.js index 1f805b6b88..4169bb5d65 100644 --- a/Open-ILS/web/js/ui/default/acq/financial/list_funding_sources.js +++ b/Open-ILS/web/js/ui/default/acq/financial/list_funding_sources.js @@ -28,14 +28,17 @@ function getBalanceInfo(rowIndex, item) { function loadFSGrid() { fieldmapper.standardRequest( - ['open-ils.acq', 'open-ils.acq.funding_source.org.retrieve'], - { async: true, + ['open-ils.acq', 'open-ils.acq.funding_source.org.retrieve'], { + async: true, params: [openils.User.authtoken, null, {flesh_summary:1}], - onresponse : function(r) { /* request object*/ + onresponse: function(r) { /* request object*/ if(fs = openils.Util.readResponse(r)) { openils.acq.FundingSource.cache[fs.id()] = fs; fsGrid.store.newItem(acqfs.toStoreItem(fs)); } + }, + oncomplete: function() { + fsGrid.hideLoadProgressIndicator(); } } ); diff --git a/Open-ILS/web/js/ui/default/acq/financial/view_funding_source.js b/Open-ILS/web/js/ui/default/acq/financial/view_funding_source.js index e847dec381..070423adff 100644 --- a/Open-ILS/web/js/ui/default/acq/financial/view_funding_source.js +++ b/Open-ILS/web/js/ui/default/acq/financial/view_funding_source.js @@ -99,13 +99,19 @@ function loadFSGrid() { /** builds the credits grid ----- */ function loadCreditGrid() { if(fsCreditGrid.isLoaded) return; - fsCreditGrid.loadAll({order_by : {acqfscred : 'effective_date DESC'}}); + fsCreditGrid.loadAll( + {"order_by": {"acqfscred": "effective_date DESC"}}, + {"funding_source": fundingSource.id()} + ); fsCreditGrid.isLoaded = true; } function loadAllocationGrid() { if(fsAllocationGrid.isLoaded) return; - fsAllocationGrid.loadAll({order_by : {acqfa : 'create_time DESC'}}); + fsAllocationGrid.loadAll( + {"order_by": {"acqfa": "create_time DESC"}}, + {"funding_source": fundingSource.id()} + ); fsAllocationGrid.isLoaded = true; } diff --git a/Open-ILS/web/js/ui/default/conify/global/acq/distribution_formula.js b/Open-ILS/web/js/ui/default/conify/global/acq/distribution_formula.js index f1ec77666e..10d19904ba 100644 --- a/Open-ILS/web/js/ui/default/conify/global/acq/distribution_formula.js +++ b/Open-ILS/web/js/ui/default/conify/global/acq/distribution_formula.js @@ -24,6 +24,9 @@ function draw() { var form = openils.Util.readResponse(r); formCache[form.id()] = form; fListGrid.store.newItem(form.toStoreItem()); + }, + oncomplete: function() { + fListGrid.hideLoadProgressIndicator(); } } ); @@ -37,7 +40,7 @@ function drawFormulaSummary() { dfeListGrid.overrideEditWidgets.formula = new dijit.form.TextBox({style:'display:none', value: formulaId}); dfeListGrid.loadAll({order_by:{acqdfe : 'formula'}}, {formula : formulaId}); - var pcrud = new openils.PermaCrud; + var pcrud = new openils.PermaCrud(); var formulaName = pcrud.retrieve('acqdf', formulaId); dojo.byId('formula_head').innerHTML = formulaName.name(); } diff --git a/Open-ILS/web/js/ui/default/conify/global/acq/edi_account.js b/Open-ILS/web/js/ui/default/conify/global/acq/edi_account.js index 40ab63ba70..87ebecd90b 100644 --- a/Open-ILS/web/js/ui/default/conify/global/acq/edi_account.js +++ b/Open-ILS/web/js/ui/default/conify/global/acq/edi_account.js @@ -4,15 +4,17 @@ dojo.require('openils.PermaCrud'); function draw() { if (! targetId) { - pListGrid.loadAll({order_by:{acqedi : 'id'}}); - pListGrid.onPostCreate = function(fmObject) { - location.href = location.href + '/' + fmObject.id(); - }; + pListGrid.loadAll({order_by:{acqedi : "id"}}); + // The following code does no good ... +// pListGrid.onPostCreate = function(fmObject) { +// location.href = location.href + '/' + fmObject.id(); +// }; return; } var pcrud = new openils.PermaCrud(); pcrud.retrieve('acqedi', targetId, { + // ... because this code here does nothing yet oncomplete : function(r) { console.log('edi_account is' + js2JSON(openils.Util.readResponse(r))); } diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd index f144ebd1b7..117100f1af 100644 --- a/Open-ILS/web/opac/locale/en-US/lang.dtd +++ b/Open-ILS/web/opac/locale/en-US/lang.dtd @@ -698,29 +698,29 @@ - + - + - + - + - + - + diff --git a/Open-ILS/web/templates/default/acq/financial/list_funds.tt2 b/Open-ILS/web/templates/default/acq/financial/list_funds.tt2 index 7dbabf74f7..7ac7971032 100644 --- a/Open-ILS/web/templates/default/acq/financial/list_funds.tt2 +++ b/Open-ILS/web/templates/default/acq/financial/list_funds.tt2 @@ -134,7 +134,6 @@
diff --git a/Open-ILS/web/templates/default/conify/global/acq/distribution_formula.tt2 b/Open-ILS/web/templates/default/conify/global/acq/distribution_formula.tt2 index 8bfc40e868..67a4840479 100644 --- a/Open-ILS/web/templates/default/conify/global/acq/distribution_formula.tt2 +++ b/Open-ILS/web/templates/default/conify/global/acq/distribution_formula.tt2 @@ -31,7 +31,6 @@ function formatName(value) {
diff --git a/Open-ILS/web/templates/default/conify/global/acq/fund_tag.tt2 b/Open-ILS/web/templates/default/conify/global/acq/fund_tag.tt2 index 9ec15340a6..6efe89ed7d 100644 --- a/Open-ILS/web/templates/default/conify/global/acq/fund_tag.tt2 +++ b/Open-ILS/web/templates/default/conify/global/acq/fund_tag.tt2 @@ -23,7 +23,6 @@ dojoType="openils.widget.AutoGrid" fieldOrder="['id', 'owner', 'name']" query="{id: '*'}" - defaultCellWidth="20" fmClass="acqft" editOnEnter="true">
diff --git a/Open-ILS/web/templates/default/conify/global/acq/provider.tt2 b/Open-ILS/web/templates/default/conify/global/acq/provider.tt2 index de3a7fa610..af98361825 100644 --- a/Open-ILS/web/templates/default/conify/global/acq/provider.tt2 +++ b/Open-ILS/web/templates/default/conify/global/acq/provider.tt2 @@ -64,7 +64,6 @@ function formatName(value) { fieldOrder="['id', 'name', 'code', 'owner', 'currency_type']" query="{id: '*'}" defaultCellWidth='"auto"' - autoHeight='true' fmClass='acqpro' showPaginator='true' editOnEnter='true'> diff --git a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul index bb83c59d1f..d5a9be499b 100644 --- a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul +++ b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul @@ -368,22 +368,22 @@ - + - + + + + + + - - - - - - - + + -- 2.43.2