renew all and some other sanity checks against glitchy xul

git-svn-id: svn://svn.open-ils.org/ILS/trunk@5306 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/xul/staff_client/server/patron/items.js b/Open-ILS/xul/staff_client/server/patron/items.js
index f409c4e..e8abab6 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/items.js
+++ b/Open-ILS/xul/staff_client/server/patron/items.js
@@ -154,10 +154,20 @@ patron.items.prototype = {
 
        'items_renew_all' : function() {
                try {
-                       this.list.select_all();
-                       this.items_renew(1);    
+                       var obj = this; var list = obj.list;
+                       function flesh_callback() {
+                               try {
+                                       obj.list.select_all();
+                                       obj.items_renew(1);     
+                                       setTimeout(function(){list.on_all_fleshed = null;},0);
+                               } catch(E) {
+                                       obj.error.standard_unexpected_error_alert('2 All items were not likely renewed',E);
+                               }
+                       }
+                       list.on_all_fleshed = flesh_callback;
+                       list.full_retrieve();
                } catch(E) {
-                       this.error.standard_unexpected_error_alert('Items were not likely renewed',E);
+                       this.error.standard_unexpected_error_alert('All items were not likely renewed',E);
                }
        },
 
@@ -165,6 +175,7 @@ patron.items.prototype = {
                var obj = this;
                try{
                        var retrieve_ids = ( which == 2 ? obj.retrieve_ids2 : obj.retrieve_ids );
+                       if (!retrieve_ids || retrieve_ids.length == 0) return;
                        JSAN.use('util.functional');
                        var msg = 'Are you sure you would like to renew item' + ( retrieve_ids.length > 1 ? 's ' : ' ') + util.functional.map_list( retrieve_ids, function(o){return o.barcode;}).join(', ') + '?';
                        var r = obj.error.yns_alert(msg,'Renewing Items','Yes','No',null,'Check here to confirm this message');
@@ -207,7 +218,15 @@ patron.items.prototype = {
                                                switch(renew[j].ilsevent) {
                                                        case 0 /* SUCCESS */ : break;
                                                        case 5000 /* PERM_FAILURE */: break;
-                                                       case 7008 /* MAX_RENEWALS_REACHED */ : break;
+                                                       case 1212 /* PATRON_EXCEEDS_OVERDUE_COUNT */ : break;
+                                                       case 7002 /* PATRON_EXCEEDS_CHECKOUT_COUNT */ : break;
+                                                       case 7003 /* COPY_CIRC_NOT_ALLOWED */ : break;
+                                                       case 7004 /* COPY_NOT_AVAILABLE */ : break;
+                                                       case 7006 /* COPY_IS_REFERENCE */ : break;
+                                                       case 7007 /* COPY_NEEDED_FOR_HOLD */ : break;
+                                                       case 7008 /* MAX_RENEWALS_REACHED */ : break; 
+                                                       case 7010 /* COPY_ALERT_MESSAGE */ : break;
+                                                       case 7013 /* PATRON_EXCEEDS_FINES */ : break;
                                                        default:
                                                                throw(renew);
                                                        break;
@@ -228,6 +247,7 @@ patron.items.prototype = {
                        var obj = this;
                        try {
                                var retrieve_ids = ( which == 2 ? obj.retrieve_ids2 : obj.retrieve_ids );
+                               if (!retrieve_ids || retrieve_ids.length == 0) return;
                                function check_date(value) {
                                        JSAN.use('util.date');
                                        try {
@@ -281,6 +301,7 @@ patron.items.prototype = {
                var obj = this;
                try {
                        var retrieve_ids = ( which == 2 ? obj.retrieve_ids2 : obj.retrieve_ids );
+                       if (!retrieve_ids || retrieve_ids.length == 0) return;
                        for (var i = 0; i < retrieve_ids.length; i++) {
                                var barcode = retrieve_ids[i].barcode;
                                dump('Mark barcode lost = ' + barcode);
@@ -298,6 +319,7 @@ patron.items.prototype = {
                var obj = this;
                try {
                        var retrieve_ids = ( which == 2 ? obj.retrieve_ids2 : obj.retrieve_ids );
+                       if (!retrieve_ids || retrieve_ids.length == 0) return;
                        function check_date(value) {
                                JSAN.use('util.date');
                                try {
@@ -353,6 +375,7 @@ patron.items.prototype = {
                var obj = this;
                try {
                        var retrieve_ids = ( which == 2 ? obj.retrieve_ids2 : obj.retrieve_ids );
+                       if (!retrieve_ids || retrieve_ids.length == 0) return;
                        JSAN.use('util.functional');
                        var msg = 'Are you sure you would like to check in item' + ( retrieve_ids.length > 1 ? 's ' : ' ') + util.functional.map_list( retrieve_ids, function(o){return o.barcode;}).join(', ') + '?';
                        var r = obj.error.yns_alert(msg,'Check In Items','Yes','No',null,'Check here to confirm this message');
@@ -377,6 +400,7 @@ patron.items.prototype = {
                var obj = this;
                try {
                        var retrieve_ids = ( which == 2 ? obj.retrieve_ids2 : obj.retrieve_ids );
+                       if (!retrieve_ids || retrieve_ids.length == 0) return;
                        for (var i = 0; i < retrieve_ids.length; i++) {
                                var doc_id = retrieve_ids[i].doc_id;
                                if (!doc_id) {
@@ -404,6 +428,7 @@ patron.items.prototype = {
                var obj = this;
                try {
                        var retrieve_ids = ( which == 2 ? obj.retrieve_ids2 : obj.retrieve_ids );
+                       if (!retrieve_ids || retrieve_ids.length == 0) return;
                        JSAN.use('util.window');
                        var win = new util.window();
                        for (var i = 0; i < retrieve_ids.length; i++) {

diff --git a/Open-ILS/xul/staff_client/server/patron/items_overlay.xul b/Open-ILS/xul/staff_client/server/patron/items_overlay.xul
index 3674c30..fd7a69e 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/items_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/patron/items_overlay.xul
@@ -16,7 +16,7 @@
                <menuitem label="Mark Lost (by Patron)" command="cmd_items_mark_lost" />
                <menuitem label="Mark Claimed Returned" command="cmd_items_claimed_returned" />
                <menuitem label="Renew" command="cmd_items_renew" />
-               <menuitem label="Renew All" command="cmd_items_renew_all" hidden="true"/>
+               <menuitem label="Renew All" command="cmd_items_renew_all" hidden="false"/>
                <menuitem label="Check In" command="cmd_items_checkin" />
                <menuitem label="Add Billing" command="cmd_add_billing" />
        </popup>
@@ -71,7 +71,7 @@
                                <menuitem label="Mark Lost (by Patron)" command="cmd_items_mark_lost" />
                                <menuitem label="Mark Claimed Returned" command="cmd_items_claimed_returned" />
                                <menuitem label="Renew" command="cmd_items_renew" />
-                               <menuitem label="Renew All" command="cmd_items_renew_all" hidden="true"/>
+                               <menuitem label="Renew All" command="cmd_items_renew_all" hidden="false"/>
                                <menuitem label="Check In" command="cmd_items_checkin" />
                                <menuitem label="Add Billing" command="cmd_add_billing" />
                        </menupopup>