Changeset 5892

Timestamp:

04/09/12 10:11:11 (12 years ago)

Author:

marcieli

Message:

Ticket #2593 - Corrigido bug gerado ao editar nome do marcador.

Location:

trunk/prototype

Files:

• config/label.ini (modified) (1 diff)
• modules/mail/js/label.js (modified) (6 diffs)

trunk/prototype/config/label.ini

@@ -7 +7 @@
 [before.delete]
 clearAllLabeledsOfLabel = modules/mail/interceptors/Helpers.php
+
+[before.update]
+verifyNameLabel = modules/mail/interceptors/Helpers.php
 
 [before.create]

trunk/prototype/modules/mail/js/label.js

@@ -30 +30 @@
                         event.preventDefault();
                         var nameLabel = $(".label-list").find(".edit-value-list").val();
-                        $(span).html($(".label-list").find(".edit-value-list").val())
-                        .parent().find('.edit').css("display","").parents("li").click(configureLabel).trigger("click");
+                        $(span).parent().find('.edit').css("display","");
                         save_editLabel(nameLabel, data.applyToSelectedMessages);
                         
@@ -113 +112 @@
                                 borderColor : winElement.find("input[name='borderColor']").val()
                         }
-                        $(".label-list-container .label-list li").each(function(){
-                                var regex_match_2 = $(this).attr("class").match(/label-item-([\d]+[()a-zA-Z]*)/);
-                                
-                                 if(regex_match_2 && regex_match_2[1] && regex_match_2[1] == labelEdited.id){
-                                   $(this).html("<input type='hidden' name='labelItemId' class='id-item-list' value='"+labelEdited.id+"'>"+"<span class='text-list'>"+labelEdited.name+"</span><div class='button close tiny' style='float: right'></div><div class='button edit tiny' style='float: right'></div>").css({
-                                        "background" : labelEdited.backgroundColor,
-                                        "color" : labelEdited.fontColor, 
-                                        "border-color" : labelEdited.borderColor        
-                                   });
-                                 }      
-                        });
-                        
-                        $("#MyMarckersList .label-list li").each(function(){
-                                var regex_match_2 = $(this).attr("class").match(/label-item-([\d]+[()a-zA-Z]*)/);
-                                
-                                if(regex_match_2 && regex_match_2[1] && regex_match_2[1] == labelEdited.id){
-                                        $(this).html("<input type='hidden' name='labelItemId' class='id-item-list' value='"+labelEdited.id+"'>"+"<span>"+labelEdited.name+"</span>");
-                                        $(this).find(".square-color").css('background', labelEdited.backgroundColor);
-                                }       
-                        });
+
                         DataLayer.put('label', labelEdited.id, labelEdited);
                         DataLayer.commit(false, false, function(data){
@@ -141 +121 @@
                                         }
                                         if(!hasLabel){
+                                                $(".label-list-container .label-list li").each(function(){
+                                                        var regex_match_2 = $(this).attr("class").match(/label-item-([\d]+[()a-zA-Z]*)/);
+                                                        
+                                                         if(regex_match_2 && regex_match_2[1] && regex_match_2[1] == labelEdited.id){
+                                                           $(this).html("<input type='hidden' name='labelItemId' class='id-item-list' value='"+labelEdited.id+"'>"+"<span class='text-list'>"+labelEdited.name+"</span><div class='button close tiny' style='float: right'></div><div class='button edit tiny' style='float: right'></div>").css({
+                                                                "background" : labelEdited.backgroundColor,
+                                                                "color" : labelEdited.fontColor, 
+                                                                "border-color" : labelEdited.borderColor        
+                                                           });
+                                                           $(this).trigger('click');
+                                                         }      
+                                                });
+                                                
+                                                $("#MyMarckersList .label-list li").each(function(){
+                                                        var regex_match_2 = $(this).attr("class").match(/label-item-([\d]+[()a-zA-Z]*)/);
+                                                        
+                                                        if(regex_match_2 && regex_match_2[1] && regex_match_2[1] == labelEdited.id){
+                                                                $(this).html("<input type='hidden' name='labelItemId' class='id-item-list' value='"+labelEdited.id+"'>"+"<span>"+labelEdited.name+"</span>");
+                                                                $(this).find(".square-color").css('background', labelEdited.backgroundColor);
+                                                        }       
+                                                });
+                                        
                                                 winElement.find(".insert-label").val("");
                                                 $.Watermark.ShowAll();
@@ -153 +155 @@
                                                 draw_tree_labels();
                                                 updateMessageLabels(labelEdited.id);
-                                                
+                                
                                                 /**
                                                 * Atualiza menu remove o menu presente em cada mensagem listada em uma pasta 
@@ -163 +165 @@
                                                 $(".add-label-button").empty()
                                                 .addClass("ui-icon ui-icon-plus");
+                                                winElement.find('.input-nome').val("").focus;
                                                 alert('Problema ao salvar marcador.');
                                         }
@@ -170 +173 @@
                         var nameLabel = winElement.find(".input-nome").val();
                         new_label(nameLabel, false, apply);                             
-                        winElement.find(".insert-label").val("");
                         $.Watermark.ShowAll();          
                         $(".save-label").button("disable");