Changeset 3735

Timestamp:

02/07/11 15:28:44 (13 years ago)

Author:

eduardoalex

Message:

Ticket #1518 - Correção para remoção de pastas locais com sub-pastas.

Location:

branches/2.2/expressoMail1_2/js

Files:

• local_messages.js (modified) (2 diffs)
• messages_controller.js (modified) (1 diff)

branches/2.2/expressoMail1_2/js/local_messages.js

@@ -158 +158 @@
         }
         catch (ex) {
-                                if(new Date.getTime()-start_trying>10000) { //too much time trying, throw an exception
+                                if(new Date().getTime()-start_trying>10000) { //too much time trying, throw an exception
                                         throw ex;
         }
@@ -851 +851 @@
 
     if(sons == 0){
-        var rs = this.dbGears.execute("select rowid from folder where folder=? and uid_usuario=?",[folder,account_id]);
-        var folder_id = rs.field(0);
-        rs.close();
-        this.dbGears.execute("delete from folder where rowid=?",[folder_id]);
-        rs = this.dbGears.execute("select rowid,mail from mail where id_folder=?",[folder_id]);
-        while(rs.isValidRow()) {
-            var rs2 = this.dbGears.execute("select url from anexo where id_mail=?",[rs.field(0)]);
-            while(rs2.isValidRow()) {
-                this.store.remove(rs2.field(0));
-                rs2.next();
-            }
-            rs2.close();
-            this.dbGears.execute("delete from anexo where id_mail=?",[rs.field(0)]);
-            var mail = connector.unserialize(rs.field(1));
-            this.store.remove(mail.url_export_file);
-            rs.next();
-        }
-        rs.close();
-        this.dbGears.execute("delete from mail where id_folder=?",[folder_id]);
-        return true
-        this.finalize();
+                var rs = this.dbGears.execute("select rowid from folder where folder=? and uid_usuario=?",[folder,account_id]);
+                var folder_id = rs.field(0);
+                rs.close();
+                this.dbGears.execute("delete from folder where rowid=?",[folder_id]);
+                rs = this.dbGears.execute("select rowid,mail from mail where id_folder=?",[folder_id]);
+                while(rs.isValidRow()) {
+                    var rs2 = this.dbGears.execute("select url from anexo where id_mail=?",[rs.field(0)]);
+                    while(rs2.isValidRow()) {
+                        this.store.remove(rs2.field(0));
+                        rs2.next();
+                    }
+                    rs2.close();
+                    this.dbGears.execute("delete from anexo where id_mail=?",[rs.field(0)]);
+                    var mail = connector.unserialize(rs.field(1));
+                    this.store.remove(mail.url_export_file);
+                    rs.next();
+                }
+                rs.close();
+                this.dbGears.execute("delete from mail where id_folder=?",[folder_id]);
+                this.finalize();
+                return true;
     }else  {
-        return false
-        this.finalize();
+                this.finalize();
+                return false;
     }
 

branches/2.2/expressoMail1_2/js/messages_controller.js

@@ -176 +176 @@
 
                         if (confirm(string_confirm)) {
-                                expresso_local_messages.remove_folder(ttree.FOLDER.substr(6));
-                                alert(get_lang("The folder %1 was successfully removed", new_caption));
-                                draw_tree_local_folders();
+                                var flag = expresso_local_messages.remove_folder(ttree.FOLDER.substr(6));
+                                if (flag) {
+                                        alert(get_lang("The folder %1 was successfully removed", new_caption));
+                                        draw_tree_local_folders();
+                                }
+                                else 
+                                        alert(get_lang("Delete your sub-folders first"));
+                                
                         }
                 }