Changeset 5813

Timestamp:

03/26/12 13:20:14 (12 years ago)

Author:

marcieli

Message:

Ticket #2569 - A busca é realizada na pasta e subpastas.

Location:

trunk

Files:

• expressoMail1_2/js/search.js (modified) (1 diff)
• prototype/modules/mail/js/foldertree.js (modified) (2 diffs)

trunk/expressoMail1_2/js/search.js

@@ -1477 +1477 @@
                         }
                         
+                        var get_children = function(folder, arr_folder){
+                                for(var y = 0; y < folder.children.length; y++){
+                                        if(folder.children[y]){
+                                                arr_folder[arr_folder.length] = folder.children[y].id;
+                                                if (folder.children[y].children.length > 0)
+                                                        arr_folder = get_children(folder.children[y], arr_folder);
+                                                
+                                        }
+                                }
+                                return arr_folder;
+                        }
+                        
                         for( var i=0; i < sel_combo.options.length; i++ )
                         {
                                 if( sel_combo.options[i].selected == true )
                                 {
-                                        if(!proxy_mensagens.is_local_folder(sel_combo.options[i].value))
+                                        var arr_folders = new Array();
+                                        if(!proxy_mensagens.is_local_folder(sel_combo.options[i].value)){
                                                 nm_box[nm_box.length] = sel_combo.options[i].value + fields;
-                                        else
+                                                
+                                                for (x in cp_tree1){
+                                                        if(cp_tree1[x].id == sel_combo.options[i].value){
+                                                                arr_folders = get_children(cp_tree1[x], arr_folders);
+                                                                for (index in arr_folders){
+                                                                        nm_box[nm_box.length] = arr_folders[index] + fields;
+                                                                }
+                                                        }
+                                                }
+                                                for (x in cp_tree2){
+                                                        if(cp_tree2[x].id == sel_combo.options[i].value){
+                                                                arr_folders = get_children(cp_tree2[x], arr_folders);
+                                                                for (index in arr_folders){
+                                                                        nm_box[nm_box.length] = arr_folders[index] + fields;
+                                                                }
+                                                        }
+                                                }
+                                                
+                                        }else
                                                 local_folders.push(sel_combo.options[i].value.substr(6));
                                 }

trunk/prototype/modules/mail/js/foldertree.js

@@ -2 +2 @@
 var selected;
 var over;
-
+var cp_tree1;
+var cp_tree2;
 function unorphanize(root, element) {
         var ok = false;
@@ -104 +105 @@
                 count_unseen_children(tree3[i]);
         }
-        
+        cp_tree1 = tree1;
+        cp_tree2 = tree2;
         $("#content_folders").removeClass("menu-degrade").parent().removeClass("image-menu");
         var html = DataLayer.render('../prototype/modules/mail/templates/detailedfoldertree.ejs', {folders: [tree1, tree2, tree3]});