[open-ils-commits] r13291 - branches/rel_1_4_0/Open-ILS/xul/staff_client/server/circ (phasefx)

[svn at svn.open-ils.org]

Author: phasefx
Date: 2009-06-02 15:59:35 -0400 (Tue, 02 Jun 2009)
New Revision: 13291

Modified:
   branches/rel_1_4_0/Open-ILS/xul/staff_client/server/circ/util.js
Log:
backport changeset 13280 and 13289 for hold list Available On columns

Modified: branches/rel_1_4_0/Open-ILS/xul/staff_client/server/circ/util.js
===================================================================
--- branches/rel_1_4_0/Open-ILS/xul/staff_client/server/circ/util.js	2009-06-02 19:59:24 UTC (rev 13290)
+++ branches/rel_1_4_0/Open-ILS/xul/staff_client/server/circ/util.js	2009-06-02 19:59:35 UTC (rev 13291)
@@ -1330,7 +1330,7 @@
 				if (my.ahr.transit() && my.ahr.transit().dest_recv_time()) {
 					return my.ahr.transit().dest_recv_time().toString();
 				}
-				if (my.ahr.capture_time()) {
+				if (!my.ahr.transit() && my.ahr.capture_time()) {
 					return my.ahr.capture_time().toString();
 				}
 				return "";
@@ -1347,7 +1347,7 @@
 				if (my.ahr.transit() && my.ahr.transit().dest_recv_time()) {
 					return my.ahr.transit().dest_recv_time().toString().substr(0,10);
 				}
-				if (my.ahr.capture_time()) {
+				if (!my.ahr.transit() && my.ahr.capture_time()) {
 					return my.ahr.capture_time().toString().substr(0,10);
 				}
 				return "";