Changeset 5660

Timestamp:

03/07/12 14:47:10 (11 years ago)

Author:

thiago

Message:

Ticket #2486 - Correção na atualização das tuplas na tabela de flags.

Location:

trunk/prototype/modules/mail

Files:

• js/followupflag.js (modified) (4 diffs)
• templates/followupflag_configure.ejs (modified) (2 diffs)

trunk/prototype/modules/mail/js/followupflag.js

@@ -163 +163 @@
         
         .filter('.menu-configure-followupflag .save').click(function(){ 
-                var saveFollowupflagged = function(){
+        var saveFollowupflagged = function(){
+                var idFollowupflagged = winElement.find('[name="followupflagId"]').val();
+                        if(idFollowupflagged.length > 0){
+                                idFollowupflagged = idFollowupflagged.split(',');
+                        } else {
+                                idFollowupflagged = false;
+                        }
+                for(i=0; i<selectedMessageIds.length; i++){
                                 var isDone = winElement.find('[name="done"]').is(':checked') ? 1 : 0;
                                 var alarmDate = false;
@@ -183 +190 @@
                                         folders.push(folder_name);
                                         
-                                        var idFollowupflagged = winElement.find('[name="followupflagId"]').val();
-                                        var followupflagged = DataLayer.merge({
-                                                uid : User.me.id,
-                                                followupflagId : followupflagId, 
-                                                folderName : folder_name, 
-                                                messageNumber : messageNumber,
-                                                isDone: isDone,
-                                                backgroundColor : backgroundColor
-                                        }, !!idFollowupflagged ? {id: idFollowupflagged} : {});
+                                                var followupflagged = DataLayer.merge({
+                                                        uid : User.me.id,
+                                                        followupflagId : followupflagId, 
+                                                        folderName : folder_name, 
+                                                        messageNumber : messageNumber,
+                                                        isDone: isDone,
+                                                        backgroundColor : backgroundColor
+                                                }, !!idFollowupflagged ? {id: idFollowupflagged[i]} : {});
                                         
                                         if (alarmDate = winElement.find('[name="alarmDate"]').datepicker("getDate")) {
@@ -243 +249 @@
                                 winElement.find('.menu-configure-followupflag .save').button("option", "disabled", true);
                 
-                }               
+                }
+    }
                 var backgroundColor = winElement.find('[name="backgroundColor"]').val();
                 var followupflagId  = winElement.find('[name="name"] option:selected').val();
@@ -310 +317 @@
                 if (event.keyCode != '27' && event.keyCode != '13')
                         winElement.find('.menu-configure-followupflag .save').button("option", "disabled", false);
-        });     
+        });
+        winElement.find(".sample-item").click(function(){
+                winElement.find('.menu-configure-followupflag .save').button("enable");
+        });
         
         winElement.find('.date').datepicker();

trunk/prototype/modules/mail/templates/followupflag_configure.ejs

@@ -40 +40 @@
                 }
         }
+        flagsId = "";
+        
+        for(x=0; x<data.messages.length; x++){
+                if(data.messages[x].followupflagged){
+                                var flagId = data.messages[x].followupflagged.id;
+                                (x+1 == data.messages.length) ? flagsId+= flagId : flagsId+= flagId+",";
+                } else {
+                        flagsId = false;
+                }
+        } 
 %>
 <div class="followupflag-container">
@@ -45 +55 @@
                 <legend><%= get_lang("Basic")%></legend>
                 <div class="followupflag-configure">
-                        <input type="hidden" class="id-followup" value="<%=(followupflagged.id)?followupflagged.id:''%>" name="followupflagId">
+                        <input type="hidden" class="id-followup" value="<%=(flagsId)?flagsId:''%>" name="followupflagId">
                         <label class="label-name"><%= get_lang("Flag as")%>:</label> 
                         <select name="name">