[open-ils-commits] r18380 - trunk/Open-ILS/xul/staff_client/server/patron (phasefx)

[svn at svn.open-ils.org]

Author: phasefx
Date: 2010-10-18 13:44:59 -0400 (Mon, 18 Oct 2010)
New Revision: 18380

Modified:
   trunk/Open-ILS/xul/staff_client/server/patron/display.js
Log:
stop sign page was incorrectly coming up for all penalties


Modified: trunk/Open-ILS/xul/staff_client/server/patron/display.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/patron/display.js	2010-10-18 16:46:52 UTC (rev 18379)
+++ trunk/Open-ILS/xul/staff_client/server/patron/display.js	2010-10-18 17:44:59 UTC (rev 18380)
@@ -932,9 +932,13 @@
                     }
                 }
                 var penalties = obj.patron.standing_penalties();
-                if (penalties.length > 0) { msg += '<dl>'; }
+                var dl_flag_opened = false;
                 for (var i = 0; i < penalties.length; i++) {
                     if (penalties[i].standing_penalty().block_list() || penalties[i].standing_penalty().id() == 20 /* ALERT_NOTE */) {
+                        if (!dl_flag_opened) {
+                            msg += '<dl>';
+                            dl_flag_opened = true;
+                        }
                         msg += '<dt>';
                         msg += obj.OpenILS.data.hash.aou[ penalties[i].org_unit() ].shortname() + ' : ' + penalties[i].standing_penalty().label() + '<br/>';
                         msg += '</dt><dd>';
@@ -942,7 +946,7 @@
                         msg += '</dd>';
                     }
                 }
-                if (penalties.length > 0) { msg += '</dl>'; }
+                if (dl_flag_opened) { msg += '</dl>'; }
                 var holds = params.holds_summary;
                 if (holds.ready && holds.ready > 0) {
                     msg += $("patronStrings").getFormattedString('staff.patron.display.init.holds_ready', [holds.ready]);