Changeset 6340 for branches/2.3/expressoMail1_2/js/local_messages.js

Timestamp:

05/29/12 14:05:15 (12 years ago)

Author:

rafaelraymundo

Message:

Ticket #2809 - Mensagem é apagada da origem caso o desarquivamento não tenha sucesso.

File:

• branches/2.3/expressoMail1_2/js/local_messages.js (modified) (1 diff)

branches/2.3/expressoMail1_2/js/local_messages.js

@@ -1239 +1239 @@
     var handler_unarchive = function(data)
     {
+        var archived = typeof (data.archived) == 'undefined' ? Array() : data.archived;
         if(preferences.keep_archived_messages == "0")
-             expresso_local_messages.delete_msgs(data.join());
+             expresso_local_messages.delete_msgs(archived.join());
         if(currentTab != 0)
-            delete_border(currentTab,'false'); 
-        write_msg(get_lang('All messages are successfully unarchived'));
-
+            delete_border(currentTab,'false');
+        
+        if (!data.error)
+        {
+            write_msg(get_lang('All messages are successfully unarchived'));
+        }
+        else if (!data.archived)
+            {
+                write_msg(get_lang('No messages were unarchived'));
+            }
+            else
+            {
+                write_msg(get_lang("Some messages weren't successfully unarchived"));
+            }
     }