[open-ils-commits] r16725 - in trunk/Open-ILS: web/js/ui/default/acq/financial web/js/ui/default/conify/global/acq web/opac/locale/en-US web/templates/default/acq/financial web/templates/default/conify/global/acq xul/staff_client/chrome/content/main (senator)
svn at svn.open-ils.org
svn at svn.open-ils.org
Tue Jun 15 17:50:22 EDT 2010
Author: senator
Date: 2010-06-15 17:50:15 -0400 (Tue, 15 Jun 2010)
New Revision: 16725
Modified:
trunk/Open-ILS/web/js/ui/default/acq/financial/list_funding_sources.js
trunk/Open-ILS/web/js/ui/default/acq/financial/view_funding_source.js
trunk/Open-ILS/web/js/ui/default/conify/global/acq/distribution_formula.js
trunk/Open-ILS/web/js/ui/default/conify/global/acq/edi_account.js
trunk/Open-ILS/web/opac/locale/en-US/lang.dtd
trunk/Open-ILS/web/templates/default/acq/financial/list_funds.tt2
trunk/Open-ILS/web/templates/default/acq/financial/view_funding_source.tt2
trunk/Open-ILS/web/templates/default/conify/global/acq/distribution_formula.tt2
trunk/Open-ILS/web/templates/default/conify/global/acq/edi_account.tt2
trunk/Open-ILS/web/templates/default/conify/global/acq/fund_tag.tt2
trunk/Open-ILS/web/templates/default/conify/global/acq/provider.tt2
trunk/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
Log:
Acq: misc minor bugfixes to various admin interfaces that didn't load
consistently. Also a little more menu re-org.
Modified: trunk/Open-ILS/web/js/ui/default/acq/financial/list_funding_sources.js
===================================================================
--- trunk/Open-ILS/web/js/ui/default/acq/financial/list_funding_sources.js 2010-06-15 21:00:34 UTC (rev 16724)
+++ trunk/Open-ILS/web/js/ui/default/acq/financial/list_funding_sources.js 2010-06-15 21:50:15 UTC (rev 16725)
@@ -28,14 +28,17 @@
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();
}
}
);
Modified: trunk/Open-ILS/web/js/ui/default/acq/financial/view_funding_source.js
===================================================================
--- trunk/Open-ILS/web/js/ui/default/acq/financial/view_funding_source.js 2010-06-15 21:00:34 UTC (rev 16724)
+++ trunk/Open-ILS/web/js/ui/default/acq/financial/view_funding_source.js 2010-06-15 21:50:15 UTC (rev 16725)
@@ -99,13 +99,19 @@
/** 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;
}
Modified: trunk/Open-ILS/web/js/ui/default/conify/global/acq/distribution_formula.js
===================================================================
--- trunk/Open-ILS/web/js/ui/default/conify/global/acq/distribution_formula.js 2010-06-15 21:00:34 UTC (rev 16724)
+++ trunk/Open-ILS/web/js/ui/default/conify/global/acq/distribution_formula.js 2010-06-15 21:50:15 UTC (rev 16725)
@@ -24,6 +24,9 @@
var form = openils.Util.readResponse(r);
formCache[form.id()] = form;
fListGrid.store.newItem(form.toStoreItem());
+ },
+ oncomplete: function() {
+ fListGrid.hideLoadProgressIndicator();
}
}
);
@@ -37,7 +40,7 @@
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();
}
Modified: trunk/Open-ILS/web/js/ui/default/conify/global/acq/edi_account.js
===================================================================
--- trunk/Open-ILS/web/js/ui/default/conify/global/acq/edi_account.js 2010-06-15 21:00:34 UTC (rev 16724)
+++ trunk/Open-ILS/web/js/ui/default/conify/global/acq/edi_account.js 2010-06-15 21:50:15 UTC (rev 16725)
@@ -4,15 +4,17 @@
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)));
}
Modified: trunk/Open-ILS/web/opac/locale/en-US/lang.dtd
===================================================================
--- trunk/Open-ILS/web/opac/locale/en-US/lang.dtd 2010-06-15 21:00:34 UTC (rev 16724)
+++ trunk/Open-ILS/web/opac/locale/en-US/lang.dtd 2010-06-15 21:50:15 UTC (rev 16725)
@@ -698,29 +698,29 @@
<!ENTITY staff.main.menu.admin.server_admin.acq.lineitem_alert.label "Line Item Alerts">
<!ENTITY staff.main.menu.admin.server_admin.acq.lineitem_alert.accesskey "L">
<!ENTITY staff.main.menu.admin.server_admin.acq.fund_tag.label "Fund Tags">
-<!ENTITY staff.main.menu.admin.server_admin.acq.fund_tag.accesskey "F">
+<!ENTITY staff.main.menu.admin.server_admin.acq.fund_tag.accesskey "G">
<!ENTITY staff.main.menu.admin.server_admin.acq.cancel_reason.label "Cancel Reasons">
-<!ENTITY staff.main.menu.admin.server_admin.acq.cancel_reason.accesskey "C">
+<!ENTITY staff.main.menu.admin.server_admin.acq.cancel_reason.accesskey "R">
<!ENTITY staff.main.menu.admin.server_admin.acq.claim_type.label "Claim Types">
<!ENTITY staff.main.menu.admin.server_admin.acq.claim_type.accesskey "T">
<!ENTITY staff.main.menu.admin.server_admin.acq.claim_event_type.label "Claim Event Types">
<!ENTITY staff.main.menu.admin.server_admin.acq.claim_event_type.accesskey "E">
<!ENTITY staff.main.menu.admin.server_admin.acq.claim_policy.label "Claim Policies">
-<!ENTITY staff.main.menu.admin.server_admin.acq.claim_policy.accesskey "P">
+<!ENTITY staff.main.menu.admin.server_admin.acq.claim_policy.accesskey "O">
<!ENTITY staff.main.menu.admin.server_admin.acq.claim_policy_action.label "Claim Policy Actions">
<!ENTITY staff.main.menu.admin.server_admin.acq.claim_policy_action.accesskey "A">
<!ENTITY staff.main.menu.admin.server_admin.acq.fund.label "Funds">
-<!ENTITY staff.main.menu.admin.server_admin.acq.fund.accesskey "N">
+<!ENTITY staff.main.menu.admin.server_admin.acq.fund.accesskey "F">
<!ENTITY staff.main.menu.admin.server_admin.acq.funding_source.label "Funding Sources">
<!ENTITY staff.main.menu.admin.server_admin.acq.funding_source.accesskey "S">
<!ENTITY staff.main.menu.admin.server_admin.acq.provider.label "Providers">
-<!ENTITY staff.main.menu.admin.server_admin.acq.provider.accesskey "V">
+<!ENTITY staff.main.menu.admin.server_admin.acq.provider.accesskey "P">
<!ENTITY staff.main.menu.admin.server_admin.acq.edi_account.label "EDI Accounts">
<!ENTITY staff.main.menu.admin.server_admin.acq.edi_account.accesskey "U">
<!ENTITY staff.main.menu.admin.server_admin.acq.distrib_formula.label "Distribution Formulas">
<!ENTITY staff.main.menu.admin.server_admin.acq.distrib_formula.accesskey "D">
<!ENTITY staff.main.menu.admin.server_admin.acq.currency_type.label "Currency Types">
-<!ENTITY staff.main.menu.admin.server_admin.acq.currency_type.accesskey "R">
+<!ENTITY staff.main.menu.admin.server_admin.acq.currency_type.accesskey "C">
<!ENTITY staff.main.menu.admin.server_admin.acq.exchange_rate.label "Exchange Rates">
<!ENTITY staff.main.menu.admin.server_admin.acq.exchange_rate.accesskey "X">
Modified: trunk/Open-ILS/web/templates/default/acq/financial/list_funds.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/acq/financial/list_funds.tt2 2010-06-15 21:00:34 UTC (rev 16724)
+++ trunk/Open-ILS/web/templates/default/acq/financial/list_funds.tt2 2010-06-15 21:50:15 UTC (rev 16725)
@@ -134,7 +134,6 @@
<div dojoType="dijit.layout.ContentPane" layoutAlign="client">
<table jsId="lfGrid"
- autoHeight='true'
dojoType="openils.widget.AutoGrid"
fieldOrder="['id', 'name', 'code', 'year', 'org', 'currency_type', 'combined_balance']"
requiredFields="['name', 'code', 'year', 'org', 'currency_type']"
Modified: trunk/Open-ILS/web/templates/default/acq/financial/view_funding_source.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/acq/financial/view_funding_source.tt2 2010-06-15 21:00:34 UTC (rev 16724)
+++ trunk/Open-ILS/web/templates/default/acq/financial/view_funding_source.tt2 2010-06-15 21:50:15 UTC (rev 16725)
@@ -125,10 +125,10 @@
<table
jsId="fsCreditGrid"
- autoHeight='true'
dojoType="openils.widget.AutoGrid"
fieldOrder="['amount', 'effective_date', 'deadline_date', 'note']"
suppressFields="['id', 'funding_source']"
+ defaultCellWidth='"auto"'
fmClass="acqfscred"
query="{id: '*'}"
showPaginator='true'>
Modified: trunk/Open-ILS/web/templates/default/conify/global/acq/distribution_formula.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/conify/global/acq/distribution_formula.tt2 2010-06-15 21:00:34 UTC (rev 16724)
+++ trunk/Open-ILS/web/templates/default/conify/global/acq/distribution_formula.tt2 2010-06-15 21:50:15 UTC (rev 16725)
@@ -31,7 +31,6 @@
</div>
</div>
<table jsId="fListGrid"
- autoHeight='true'
dojoType="openils.widget.AutoGrid"
fieldOrder="['id', 'name', 'owner', 'item_count', 'skip_count']"
query="{id: '*'}"
Modified: trunk/Open-ILS/web/templates/default/conify/global/acq/edi_account.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/conify/global/acq/edi_account.tt2 2010-06-15 21:00:34 UTC (rev 16724)
+++ trunk/Open-ILS/web/templates/default/conify/global/acq/edi_account.tt2 2010-06-15 21:50:15 UTC (rev 16725)
@@ -51,7 +51,6 @@
fieldOrder="['id', 'label', 'host', 'username', 'password', 'account', 'owner', 'last_activity', 'provider', 'path', 'in_dir', 'vendcode']"
query="{id: '*'}"
defaultCellWidth='"auto"'
- autoHeight='true'
fmClass='acqedi'
showPaginator='true'
editOnEnter='true'>
Modified: trunk/Open-ILS/web/templates/default/conify/global/acq/fund_tag.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/conify/global/acq/fund_tag.tt2 2010-06-15 21:00:34 UTC (rev 16724)
+++ trunk/Open-ILS/web/templates/default/conify/global/acq/fund_tag.tt2 2010-06-15 21:50:15 UTC (rev 16725)
@@ -23,7 +23,6 @@
dojoType="openils.widget.AutoGrid"
fieldOrder="['id', 'owner', 'name']"
query="{id: '*'}"
- defaultCellWidth="20"
fmClass="acqft"
editOnEnter="true">
</table>
Modified: trunk/Open-ILS/web/templates/default/conify/global/acq/provider.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/conify/global/acq/provider.tt2 2010-06-15 21:00:34 UTC (rev 16724)
+++ trunk/Open-ILS/web/templates/default/conify/global/acq/provider.tt2 2010-06-15 21:50:15 UTC (rev 16725)
@@ -64,7 +64,6 @@
fieldOrder="['id', 'name', 'code', 'owner', 'currency_type']"
query="{id: '*'}"
defaultCellWidth='"auto"'
- autoHeight='true'
fmClass='acqpro'
showPaginator='true'
editOnEnter='true'>
Modified: trunk/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul 2010-06-15 21:00:34 UTC (rev 16724)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul 2010-06-15 21:50:15 UTC (rev 16725)
@@ -368,22 +368,22 @@
<menuitem label="&staff.main.menu.admin.server_admin.conify.usr_setting_type;" command="cmd_server_admin_usr_setting_type"/>
<menu id="main.menu.admin.server.acq" label="&staff.main.menu.admin.server_admin.acq.label;" accesskey="&staff.main.menu.admin.server_admin.acq.accesskey;">
<menupopup id="main.menu.admin.server.acq.popup">
- <menuitem label="&staff.main.menu.admin.server_admin.acq.lineitem_alert.label;" accesskey="&staff.main.menu.admin.server_admin.acq.lineitem_alert.accesskey;" command="cmd_server_admin_acq_lineitem_alert"/>
+ <menuitem label="&staff.main.menu.admin.server_admin.acq.fund.label;" accesskey="&staff.main.menu.admin.server_admin.acq.fund.accesskey;" command="cmd_server_admin_acq_fund" />
<menuitem label="&staff.main.menu.admin.server_admin.acq.fund_tag.label;" accesskey="&staff.main.menu.admin.server_admin.acq.fund_tag.accesskey;" command="cmd_server_admin_acq_fund_tag"/>
- <menuitem label="&staff.main.menu.admin.server_admin.acq.cancel_reason.label;" accesskey="&staff.main.menu.admin.server_admin.acq.cancel_reason.accesskey;" command="cmd_server_admin_acq_cancel_reason"/>
+ <menuitem label="&staff.main.menu.admin.server_admin.acq.funding_source.label;" accesskey="&staff.main.menu.admin.server_admin.acq.funding_source.accesskey;" command="cmd_server_admin_acq_funding_source" />
+ <menuitem label="&staff.main.menu.admin.server_admin.acq.distrib_formula.label;" accesskey="&staff.main.menu.admin.server_admin.acq.distrib_formula.accesskey;" command="cmd_server_admin_acq_distrib_formula" />
+ <menuitem label="&staff.main.menu.admin.server_admin.acq.currency_type.label;" accesskey="&staff.main.menu.admin.server_admin.acq.currency_type.accesskey;" command="cmd_server_admin_acq_currency_type" />
+ <menuitem label="&staff.main.menu.admin.server_admin.acq.exchange_rate.label;" accesskey="&staff.main.menu.admin.server_admin.acq.exchange_rate.accesskey;" command="cmd_server_admin_acq_exchange_rate" />
+ <menuitem label="&staff.main.menu.admin.server_admin.acq.provider.label;" accesskey="&staff.main.menu.admin.server_admin.acq.provider.accesskey;" command="cmd_server_admin_acq_provider" />
+ <menuitem label="&staff.main.menu.admin.server_admin.acq.edi_account.label;" accesskey="&staff.main.menu.admin.server_admin.acq.edi_account.accesskey;" command="cmd_server_admin_acq_edi_account" />
<menuseparator />
<menuitem label="&staff.main.menu.admin.server_admin.acq.claim_type.label;" accesskey="&staff.main.menu.admin.server_admin.acq.claim_type.accesskey;" command="cmd_server_admin_acq_claim_type"/>
<menuitem label="&staff.main.menu.admin.server_admin.acq.claim_event_type.label;" accesskey="&staff.main.menu.admin.server_admin.acq.claim_event_type.accesskey;" command="cmd_server_admin_acq_claim_event_type"/>
<menuitem label="&staff.main.menu.admin.server_admin.acq.claim_policy.label;" accesskey="&staff.main.menu.admin.server_admin.acq.claim_policy.accesskey;" command="cmd_server_admin_acq_claim_policy"/>
<menuitem label="&staff.main.menu.admin.server_admin.acq.claim_policy_action.label;" accesskey="&staff.main.menu.admin.server_admin.acq.claim_policy_action.accesskey;" command="cmd_server_admin_acq_claim_policy_action"/>
<menuseparator />
- <menuitem label="&staff.main.menu.admin.server_admin.acq.fund.label;" accesskey="&staff.main.menu.admin.server_admin.acq.fund.accesskey;" command="cmd_server_admin_acq_fund" />
- <menuitem label="&staff.main.menu.admin.server_admin.acq.funding_source.label;" accesskey="&staff.main.menu.admin.server_admin.acq.funding_source.accesskey;" command="cmd_server_admin_acq_funding_source" />
- <menuitem label="&staff.main.menu.admin.server_admin.acq.provider.label;" accesskey="&staff.main.menu.admin.server_admin.acq.provider.accesskey;" command="cmd_server_admin_acq_provider" />
- <menuitem label="&staff.main.menu.admin.server_admin.acq.edi_account.label;" accesskey="&staff.main.menu.admin.server_admin.acq.edi_account.accesskey;" command="cmd_server_admin_acq_edi_account" />
- <menuitem label="&staff.main.menu.admin.server_admin.acq.currency_type.label;" accesskey="&staff.main.menu.admin.server_admin.acq.currency_type.accesskey;" command="cmd_server_admin_acq_currency_type" />
- <menuitem label="&staff.main.menu.admin.server_admin.acq.exchange_rate.label;" accesskey="&staff.main.menu.admin.server_admin.acq.exchange_rate.accesskey;" command="cmd_server_admin_acq_exchange_rate" />
- <menuitem label="&staff.main.menu.admin.server_admin.acq.distrib_formula.label;" accesskey="&staff.main.menu.admin.server_admin.acq.distrib_formula.accesskey;" command="cmd_server_admin_acq_distrib_formula" />
+ <menuitem label="&staff.main.menu.admin.server_admin.acq.lineitem_alert.label;" accesskey="&staff.main.menu.admin.server_admin.acq.lineitem_alert.accesskey;" command="cmd_server_admin_acq_lineitem_alert"/>
+ <menuitem label="&staff.main.menu.admin.server_admin.acq.cancel_reason.label;" accesskey="&staff.main.menu.admin.server_admin.acq.cancel_reason.accesskey;" command="cmd_server_admin_acq_cancel_reason"/>
</menupopup>
</menu>
<menu id="main.menu.admin.server.booking" label="&staff.main.menu.admin.server_admin.booking.label;" accesskey="&staff.main.menu.admin.server_admin.booking.accesskey;">
More information about the open-ils-commits
mailing list