[open-ils-commits] [GIT] Evergreen ILS branch master updated. f08d08c091ff85337338f6ba12fa281d92b4a18d
Evergreen Git
git at git.evergreen-ils.org
Fri Jul 13 09:58:49 EDT 2012
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, master has been updated
via f08d08c091ff85337338f6ba12fa281d92b4a18d (commit)
via 4635f7a29db33dc3982093460ffe17b6d9172e42 (commit)
from a54cd9c3c0a50887561eb7633efc12fb22ca322d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f08d08c091ff85337338f6ba12fa281d92b4a18d
Author: Bill Erickson <berick at esilibrary.com>
Date: Mon Jun 11 15:23:17 2012 -0400
Cache propagated funds in fund rollover action
Repair display of propagated funds grid which was likely broken with
b9bb6d47. Propagated funds must be collected and added to the local
cache for grid getter functions to find them.
https://bugs.launchpad.net/evergreen/+bug/1011789
Signed-off-by: Bill Erickson <berick at esilibrary.com>
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/Open-ILS/web/js/ui/default/acq/financial/list_funds.js b/Open-ILS/web/js/ui/default/acq/financial/list_funds.js
index 5b212c6..17873d0 100644
--- a/Open-ILS/web/js/ui/default/acq/financial/list_funds.js
+++ b/Open-ILS/web/js/ui/default/acq/financial/list_funds.js
@@ -207,6 +207,10 @@ function performRollover(args) {
}
)
+ // add the new, rolled funds to the cache. Note that in dry-run
+ // mode, these are ephemeral and no longer exist on the server.
+ cachedFunds = cachedFunds.concat(rolloverResponses);
+
dojo.byId('acq-fund-list-rollover-summary-header').innerHTML =
dojo.string.substitute(
localeStrings.FUND_LIST_ROLLOVER_SUMMARY,
commit 4635f7a29db33dc3982093460ffe17b6d9172e42
Author: Bill Erickson <berick at esilibrary.com>
Date: Mon Jun 11 15:19:48 2012 -0400
Repair PCrudFilter localeStrings variable collisions
Rename PCrudFilter's localeStrings global variable to avoid name
collisions with UI scripts that define the same variable.
Signed-off-by: Bill Erickson <berick at esilibrary.com>
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/Open-ILS/web/js/dojo/openils/widget/PCrudFilterDialog.js b/Open-ILS/web/js/dojo/openils/widget/PCrudFilterDialog.js
index df1c374..09a26fb 100644
--- a/Open-ILS/web/js/dojo/openils/widget/PCrudFilterDialog.js
+++ b/Open-ILS/web/js/dojo/openils/widget/PCrudFilterDialog.js
@@ -42,8 +42,7 @@ if (!dojo._hasResource['openils.widget.PCrudFilterDialog']) {
dojo.requireLocalization("openils.widget", "PCrudFilterDialog");
- /* XXX namespace pollution! arg! Fix this whole module sometime. */
- var localeStrings = dojo.i18n.getLocalization(
+ var pcFilterLocaleStrings = dojo.i18n.getLocalization(
"openils.widget", "PCrudFilterDialog"
);
@@ -59,65 +58,65 @@ if (!dojo._hasResource['openils.widget.PCrudFilterDialog']) {
"items": [
{
"name": "=",
- "label": localeStrings.OPERATOR_EQ,
+ "label": pcFilterLocaleStrings.OPERATOR_EQ,
"param_count": 1,
"minimal": true,
"strict": true
}, {
"name": "!=",
- "label": localeStrings.OPERATOR_NE,
+ "label": pcFilterLocaleStrings.OPERATOR_NE,
"param_count": 1,
"minimal": true,
"strict": true
}, {
"name": "null",
- "label": localeStrings.OPERATOR_IS_NULL,
+ "label": pcFilterLocaleStrings.OPERATOR_IS_NULL,
"param_count": 0,
"minimal": true,
"strict": true
}, {
"name": "not null",
- "label": localeStrings.OPERATOR_IS_NOT_NULL,
+ "label": pcFilterLocaleStrings.OPERATOR_IS_NOT_NULL,
"param_count": 0,
"minimal": true,
"strict": true
}, {
"name": ">",
- "label": localeStrings.OPERATOR_GT,
+ "label": pcFilterLocaleStrings.OPERATOR_GT,
"param_count": 1,
"strict": true
}, {
"name": "<",
- "label": localeStrings.OPERATOR_LT,
+ "label": pcFilterLocaleStrings.OPERATOR_LT,
"param_count": 1,
"strict": true
}, {
"name": ">=",
- "label": localeStrings.OPERATOR_GTE,
+ "label": pcFilterLocaleStrings.OPERATOR_GTE,
"param_count": 1,
"strict": true
}, {
"name": "<=",
- "label": localeStrings.OPERATOR_LTE,
+ "label": pcFilterLocaleStrings.OPERATOR_LTE,
"param_count": 1,
"strict": true
}, {
"name": "between",
- "label": localeStrings.OPERATOR_BETWEEN,
+ "label": pcFilterLocaleStrings.OPERATOR_BETWEEN,
"param_count": 2,
"strict": true
}, {
"name": "not between",
- "label": localeStrings.OPERATOR_NOT_BETWEEN,
+ "label": pcFilterLocaleStrings.OPERATOR_NOT_BETWEEN,
"param_count": 2,
"strict": true
}, {
"name": "like",
- "label": localeStrings.OPERATOR_LIKE,
+ "label": pcFilterLocaleStrings.OPERATOR_LIKE,
"param_count": 1
}, {
"name": "not like",
- "label": localeStrings.OPERATOR_NOT_LIKE,
+ "label": pcFilterLocaleStrings.OPERATOR_NOT_LIKE,
"param_count": 1
}
]
@@ -197,7 +196,7 @@ if (!dojo._hasResource['openils.widget.PCrudFilterDialog']) {
dojo.create(
"td", {
"colspan": 4,
- "innerHTML": localeStrings.EMPTY_CASE
+ "innerHTML": pcFilterLocaleStrings.EMPTY_CASE
}, tr
);
@@ -516,7 +515,7 @@ if (!dojo._hasResource['openils.widget.PCrudFilterDialog']) {
constructor : function(args) {
for(var k in args)
this[k] = args[k];
- this.title = this.title || localeStrings.DEFAULT_DIALOG_TITLE;
+ this.title = this.title || pcFilterLocaleStrings.DEFAULT_DIALOG_TITLE;
this.widgetIndex = 0;
this.widgetCache = {};
},
@@ -532,7 +531,7 @@ if (!dojo._hasResource['openils.widget.PCrudFilterDialog']) {
new dijit.form.Button(
{
- "label": localeStrings.ADD_ROW,
+ "label": pcFilterLocaleStrings.ADD_ROW,
"scrollOnFocus": false, /* almost always better */
"onClick": function() {
self.filter_row_manager.add_row();
@@ -542,7 +541,7 @@ if (!dojo._hasResource['openils.widget.PCrudFilterDialog']) {
new dijit.form.Button(
{
- "label": localeStrings.APPLY,
+ "label": pcFilterLocaleStrings.APPLY,
"scrollOnFocus": false,
"onClick": function() {
if (self.onApply)
@@ -554,7 +553,7 @@ if (!dojo._hasResource['openils.widget.PCrudFilterDialog']) {
new dijit.form.Button(
{
- "label": localeStrings.CANCEL,
+ "label": pcFilterLocaleStrings.CANCEL,
"scrollOnFocus": false,
"onClick": function() {
if (self.onCancel)
-----------------------------------------------------------------------
Summary of changes:
.../js/dojo/openils/widget/PCrudFilterDialog.js | 37 +++++++++----------
.../web/js/ui/default/acq/financial/list_funds.js | 4 ++
2 files changed, 22 insertions(+), 19 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list