Changeset 4582 for branches/2.2.0.1

Timestamp:

06/03/11 11:08:56 (13 years ago)

Author:

rafaelraymundo

Message:

Ticket #1952 - Exibe CPF do usuário ao invés do nome da pasta na busca em caixa comp.

Location:

branches/2.2.0.1/expressoMail1_2/js

Files:

• common_functions.js (modified) (1 diff)
• draw_api.js (modified) (2 diffs)
• search.js (modified) (2 diffs)

branches/2.2.0.1/expressoMail1_2/js/common_functions.js

@@ -1020 +1020 @@
         }
 }
+
+function translateFolder(folderName){
+
+    for (var i = 0; i < folders.length; i++)
+    {
+        if (folders[i].folder_parent == 'user'
+            && folderName == folders[i].folder_id.split(cyrus_delimiter).pop())
+        {
+            if (folders[i].folder_id.split(cyrus_delimiter).pop() != folders[i].folder_name)
+            {
+                return folders[i].folder_name;
+            }
+        }
+    }
+
+    return folderName;
+}

branches/2.2.0.1/expressoMail1_2/js/draw_api.js

@@ -20 +20 @@
 // Objeto Map, talvez o ideal fosse adicionar este objeto à Api do egroupware, e carregá-lo
 // aqui no expressoMail.
-function Map()
-{
-        this.keys = new Array();
-        this.values = new Array();
-}
-
-Map.prototype.add = function(key, value)
-{
-        this.keys.push(key);
-        this.values.push(value);
-}
-
-Map.prototype.get = function(key)
-{
-        result = new Array();
-        for (i = 0; i < this.keys.length; i++)
-        {
-                if (this.keys[i] == key)
-                {
-                        result.push(this.values[i]);
-                }
-        }
-
-        if (result.length == 0)
-        {
-                return null;
-        }
-
-        return result;
-}
-
-translatedFolders = new Map();
-
-function update_translations(folders)
-{
-    translatedFolders = new Map();
-    for (i = 0; i < folders.length; i++)
-    {
-        if (folders[i].folder_parent == 'user'){
-            tmpFolderId = folders[i].folder_id.split(cyrus_delimiter).pop();
-            if (tmpFolderId != folders[i].folder_name)
-            {
-                translatedFolders.add(tmpFolderId, folders[i].folder_name);
-            }
-        }
-    }
-}
-
 
 function draw_tree_folders(folders){
         // Check if the tree folders alredy exist.
-        translatedFolders = new Map();
         if (Element('dftree_tree_folders')){
                 if (!expresso_offline) {
@@ -475 +426 @@
                 }
 
-                draw_tree_folders(data);
+                draw_tree_folders(data);                
                 if(data) {
 
-                        update_translations(data);
                         build_quota(data);
                         var f_unseen = Element('dftree_'+current_folder+'_unseen');

branches/2.2.0.1/expressoMail1_2/js/search.js

@@ -490 +490 @@
                                         
                                         var td1  = get_lang(td1).substr(get_lang(td1).length-1) == "*"?td1:get_lang(td1);
-                    if ((tmp = translatedFolders.get(td1)))
-                    {
-                        td1 = tmp;
-                    }
+                    
+                                        td1 = translateFolder(td1);
+                    
 
                                         if( proxy_mensagens.is_local_folder(td1))
@@ -905 +904 @@
                         }
                 }
+                name_box_def = translateFolder(name_box_def);
                 var opt = new Option(lang_folder(name_box_def),this.name_box_search,false,true);
                 sel[sel.length] = opt;