[open-ils-commits] [GIT] Evergreen ILS branch rel_2_3 updated. e95a1509ea714783bf9fecc43df60c9c63f978b9
Evergreen Git
git at git.evergreen-ils.org
Tue Nov 19 15:12:41 EST 2013
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, rel_2_3 has been updated
via e95a1509ea714783bf9fecc43df60c9c63f978b9 (commit)
from 9ccd46714ca294ce869502dd6c325355108dd692 (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 e95a1509ea714783bf9fecc43df60c9c63f978b9
Author: Jason Etheridge <jason at esilibrary.com>
Date: Thu Sep 20 16:02:16 2012 -0400
better refresh of patron summary interface
after certain actions in Items Out and Bills, like Add Billing
Signed-off-by: Jason Etheridge <jason at esilibrary.com>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
diff --git a/Open-ILS/xul/staff_client/server/patron/bill2.js b/Open-ILS/xul/staff_client/server/patron/bill2.js
index 6adf3f2..a9af71d 100644
--- a/Open-ILS/xul/staff_client/server/patron/bill2.js
+++ b/Open-ILS/xul/staff_client/server/patron/bill2.js
@@ -159,7 +159,10 @@ function event_listeners() {
'chrome,resizable,modal',
{ 'patron_id' : g.patron_id }
);
- if (my_xulG.xact_id) { g.funcs.push( gen_list_append_func( my_xulG.xact_id ) ); /* FIXME: do something to update summary sidebar */ }
+ if (my_xulG.xact_id) {
+ g.funcs.push( gen_list_append_func( my_xulG.xact_id ) );
+ if (typeof window.xulG == 'object' && typeof window.xulG.on_money_change == 'function') window.xulG.on_money_change();
+ }
},
false
);
diff --git a/Open-ILS/xul/staff_client/server/patron/display.js b/Open-ILS/xul/staff_client/server/patron/display.js
index 28522af..6cbc922 100644
--- a/Open-ILS/xul/staff_client/server/patron/display.js
+++ b/Open-ILS/xul/staff_client/server/patron/display.js
@@ -218,7 +218,9 @@ patron.display.prototype = {
obj.summary_window.g.summary.controller.render('patron_checkouts');
obj.summary_window.g.summary.controller.render('patron_standing_penalties');
obj.summary_window.g.summary.controller.render('patron_bill');
- obj.bill_window.g.bills.refresh(true);
+ if (obj.bill_window) {
+ obj.bill_window.refresh(true);
+ }
},
'url_prefix' : function(url,secure) { return xulG.url_prefix(url,secure); },
'get_new_session' : function(a) { return xulG.get_new_session(a); },
@@ -521,6 +523,8 @@ patron.display.prototype = {
'get_new_session' : function(a) { return xulG.get_new_session(a); },
'new_tab' : function(a,b,c) { return xulG.new_tab(a,b,c); },
'on_money_change' : function(b) {
+ obj.summary_window.g.summary.controller.render('patron_standing_penalties');
+ obj.summary_window.g.summary.controller.render('patron_bill');
obj.summary_window.refresh();
}
}
diff --git a/Open-ILS/xul/staff_client/server/patron/items.js b/Open-ILS/xul/staff_client/server/patron/items.js
index d129339..a2fc061 100644
--- a/Open-ILS/xul/staff_client/server/patron/items.js
+++ b/Open-ILS/xul/staff_client/server/patron/items.js
@@ -156,12 +156,12 @@ patron.items.prototype = {
'cmd_items_renew_all' : [ ['command'], function() { obj.items_renew_all({which_list:1}); } ],
'cmd_items_renew2' : [ ['command'], function() { obj.items_renew({which_list:2}); } ],
'cmd_items_renew_with_date2' : [ ['command'], function() { obj.items_renew({which_list:2,skip_prompt:true,get_date:true}); } ],
- 'cmd_items_edit' : [ ['command'], function() { obj.items_edit(1); /*obj.retrieve();*/ } ],
- 'cmd_items_edit2' : [ ['command'], function() { obj.items_edit(2); /*obj.retrieve();*/ } ],
- 'cmd_items_mark_lost' : [ ['command'], function() { obj.items_mark_lost(1); /*obj.retrieve();*/ } ],
- 'cmd_items_mark_lost2' : [ ['command'], function() { obj.items_mark_lost(2); /*obj.retrieve();*/ } ],
- 'cmd_items_claimed_returned' : [ ['command'], function() { obj.items_claimed_returned(1); /*obj.retrieve();*/ } ],
- 'cmd_items_claimed_returned2' : [ ['command'], function() { obj.items_claimed_returned(2); /*obj.retrieve();*/ } ],
+ 'cmd_items_edit' : [ ['command'], function() { obj.items_edit(1); obj.refresh_outer_interfaces(); } ],
+ 'cmd_items_edit2' : [ ['command'], function() { obj.items_edit(2); obj.refresh_outer_interfaces(); } ],
+ 'cmd_items_mark_lost' : [ ['command'], function() { obj.items_mark_lost(1); obj.refresh_outer_interfaces(); } ],
+ 'cmd_items_mark_lost2' : [ ['command'], function() { obj.items_mark_lost(2); obj.refresh_outer_interfaces(); } ],
+ 'cmd_items_claimed_returned' : [ ['command'], function() { obj.items_claimed_returned(1); obj.refresh_outer_interfaces(); } ],
+ 'cmd_items_claimed_returned2' : [ ['command'], function() { obj.items_claimed_returned(2); obj.refresh_outer_interfaces(); } ],
'cmd_items_claimed_never_checked_out' : [
['command'],
function() {
@@ -178,12 +178,12 @@ patron.items.prototype = {
);
}
],
- 'cmd_items_checkin' : [ ['command'], function() { obj.items_checkin(1); /*obj.retrieve();*/ } ],
- 'cmd_items_checkin2' : [ ['command'], function() { obj.items_checkin(2); /*obj.retrieve();*/ } ],
+ 'cmd_items_checkin' : [ ['command'], function() { obj.items_checkin(1); obj.refresh_outer_interfaces(); } ],
+ 'cmd_items_checkin2' : [ ['command'], function() { obj.items_checkin(2); obj.refresh_outer_interfaces(); } ],
'cmd_show_catalog' : [ ['command'], function() { obj.show_catalog(1); } ],
'cmd_show_catalog2' : [ ['command'], function() { obj.show_catalog(2); } ],
- 'cmd_add_billing' : [ ['command'], function() { obj.add_billing(1); /*obj.retrieve();*/ } ],
- 'cmd_add_billing2' : [ ['command'], function() { obj.add_billing(2); /*obj.retrieve();*/ } ],
+ 'cmd_add_billing' : [ ['command'], function() { obj.add_billing(1); obj.refresh_outer_interfaces(); } ],
+ 'cmd_add_billing2' : [ ['command'], function() { obj.add_billing(2); obj.refresh_outer_interfaces(); } ],
'cmd_show_noncats' : [ ['command'], function() { obj.show_noncats(); } ]
}
}
@@ -941,9 +941,14 @@ patron.items.prototype = {
}
exec.chain( rows );
if (!dont_show_me_the_list_change) {
- if (window.xulG && typeof window.xulG.on_list_change == 'function') {
- try { window.xulG.on_list_change(obj.checkouts); } catch(E) { this.error.sdump('D_ERROR',E); }
- }
+ obj.refresh_outer_interfaces();
+ }
+ },
+
+ 'refresh_outer_interfaces' : function() {
+ var obj = this;
+ if (window.xulG && typeof window.xulG.on_list_change == 'function') {
+ try { window.xulG.on_list_change(obj.checkouts); } catch(E) { this.error.sdump('D_ERROR',E); }
}
},
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/xul/staff_client/server/patron/bill2.js | 5 ++-
Open-ILS/xul/staff_client/server/patron/display.js | 6 +++-
Open-ILS/xul/staff_client/server/patron/items.js | 31 +++++++++++--------
3 files changed, 27 insertions(+), 15 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list