Changeset 5779

Timestamp:

03/21/12 16:43:21 (12 years ago)

Author:

thiago

Message:

Ticket #2556 - [Funcionamento] Quantidade de mensagens para anexo não está sendo exibida.

File:

• trunk/prototype/modules/attach_message/attach_message.js (modified) (8 diffs)

trunk/prototype/modules/attach_message/attach_message.js

@@ -114 +114 @@
                 };
         for(var flag in cell){
-                 classes += '<span class="flags '+ (cell[flag]).toLowerCase() +((cell[flag]) == '' ? '"' : '" title="'+ get_lang((cell[flag])))+'"> </span>';   
-        }
-        
+                classes += '<span class="flags '+ (cell[flag]).toLowerCase() +((cell[flag]) == '' ? '"' : '" title="'+ get_lang((cell[flag])))+'"> </span>';    
+        }
+
         if(rowObject.labels){           
                 classes += '<span class="flags labeled"> </span>';
@@ -122 +122 @@
                 classes += '<span class="flags"> </span>';
         }
-        
         if(rowObject.followupflagged){          
-                classes += '<span class="flags followupflagged" style="background:'+rowObject.followupflagged.backgroundColor+';"><img src="../prototype/modules/mail/img/flagEditor.png"></span>';
+                if(rowObject.followupflagged.followupflag.id < 7){
+                        var nameFollowupflag = get_lang(rowObject.followupflagged.followupflag.name);
+                }else{
+                        var nameFollowupflag = rowObject.followupflagged.followupflag.name;
+                }
+                classes += '<span class="flags followupflagged" title="'+nameFollowupflag+'" style="background:'+rowObject.followupflagged.backgroundColor+';"><img src="../prototype/modules/mail/img/flagEditor.png"></span>';
         }
         return classes;
@@ -337 +341 @@
                                 {name:'subject',index:'subject', width:245, sortable:false},
                                 {name:'timestamp',index:'timestamp', width:65, align:"center", sortable:false, formatter:date2Time},
-                                {name:'size',index:'size', width:55, align:"right", sortable:false, formatter:bytes2Size} 
+                                {name:'size',index:'size', width:55, align:"right", sortable:false, formatter:bytes2Size}
                         ],
                         jsonReader : {
@@ -392 +396 @@
                                 var tabPanelTemplateId = 'mailpreview_tab_' + selectedFolder.id.replace(/[.\/]/, '_') + '_' + message.msg_number;
                                 var tabPanelTemplateId = tabPanelTemplateId.replace(/[\s\/]/g, '-');
-        
-                                if (selected) {
-                                        
+                                
+                                if (selected) {         
                                         if (onceOpenedMessages[selectedFolder.id] && onceOpenedMessages[selectedFolder.id][message.msg_number]) {
-
                                                 if (!selectedMessages[selectedFolder.id])
                                                         selectedMessages[selectedFolder.id] = {};
@@ -406 +408 @@
                                                 if (tabPanelTemplateLabel.length > $mailpreview_tabs_label_length + 3)
                                                         tabPanelTemplateLabel = tabPanelTemplateLabel.substring(0, $mailpreview_tabs_label_length) + '...';
-                                                        
-                                                                
-                                                if (!$('#' + tabPanelTemplateId).length) {      
-                                                                
+                                                
+                                                if (!$('#' + tabPanelTemplateId).length) {                                                              
                                                         $mailpreview_tabs.tabs("add", '#' + tabPanelTemplateId, tabPanelTemplateLabel)
                                                         .find('.message.empty-container').hide().end()
@@ -443 +443 @@
                                                 if (!selectedMessages[selectedFolder.id])
                                                         selectedMessages[selectedFolder.id] = {};
-                                                selectedMessages[selectedFolder.id][message.msg_number] = true; 
+                                                selectedMessages[selectedFolder.id][message.msg_number] = true;
                                                 $.ajax({
                                                         accepts: 'text/html',
                                                         url: BASE_PATH + 'REST.php'+offlineCase+'?q=folder/'+selectedFolder.id.replace(dashes, '.')+'/message/'+id,
                                                         dataType: 'json',
-                                                        success: function( mail_preview ){      
-                                                                        
+                                                        success: function( mail_preview ){              
+                                                                //selectedMessagesCount();
                                                                 if (!onceOpenedMessages[selectedFolder.id])
                                                                         onceOpenedMessages[selectedFolder.id] = {};
                                                                 onceOpenedMessages[selectedFolder.id][message.msg_number] = jQuery.extend(true, message, mail_preview);
+
                                                                 $('#mailpreview_container').unblock();
+
                                                                 var tabPanelTemplateLabel = onceOpenedMessages[selectedFolder.id][message.msg_number].subject;
-                                                                        selectedMessagesCount();        
+                                                                selectedMessagesCount();
                                                                 if (tabPanelTemplateLabel.length > $mailpreview_tabs_label_length + 3)
                                                                         tabPanelTemplateLabel = tabPanelTemplateLabel.substring(0, $mailpreview_tabs_label_length) + '...';
-                                                                if (!$('#' + tabPanelTemplateId).length) {                                              
+                                                                
+                                                                if (!$('#' + tabPanelTemplateId).length) {                                                              
                                                                         $mailpreview_tabs.tabs("add", '#' + tabPanelTemplateId, tabPanelTemplateLabel)
                                                                         .find('.message.empty-container').hide().end()
@@ -469 +472 @@
                                                                         )
                                                                         .find('[class^="ExpressoCssWrapper"]').addClass("mailpreview-message-body");
-                                                                        
                                                                 } else {
                                                                         $mailpreview_tabs.tabs('select', '#' + tabPanelTemplateId)
                                                                         .find('#' + tabPanelTemplateId + ', [href="#' + tabPanelTemplateId + '"]').removeClass('preview-message-unselected');
-                                                                }       
+                                                                }
+                                                                
                                                         }
                                                 });
@@ -492 +495 @@
                                 }
                                 
-                                if (onceOpenedMessages[selectedFolder.id] && onceOpenedMessages[selectedFolder.id][message.msg_number]){
+                                if (onceOpenedMessages[selectedFolder.id] && onceOpenedMessages[selectedFolder.id][message.msg_number])
                                         selectedMessagesCount();
-                                }
                         },
                         caption: '<span class="'+selectedFolder['class']+'">'+selectedFolder.name+'</span>'