Changeset 5579

Timestamp:

02/28/12 15:36:40 (11 years ago)

Author:

thiago

Message:

Ticket #2486 - Correção de um bug na tela dos sinalizadores.

File:

• trunk/prototype/modules/mail/templates/followupflag_configure.ejs (modified) (3 diffs)

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

@@ -7 +7 @@
                 if (followupflagged.alarmDeadline)
                         followupflagged.alarmDeadline = Date.parseExact(followupflagged.alarmDeadline, 'yyyy-MM-dd hh:mm:ss');
-                        
+                followupflagged.followupflag.id = data.followupflags[data.messages[0].followupflagged.followupflagId-1].id;
         } else if (data.messages.length > 1) {
                 var followupflagged = {
@@ -24 +24 @@
                                 break;
                         }
-                        followupflagged.followupflag.name = (followupflagged.followupflag.name && data.messages[i].followupflagged.followupflag.name == data.messages[i-1].followupflagged.followupflag.name) ?
-                                data.messages[i].followupflagged.followupflag.name : false;
+                        
+                        followupflagged.followupflag.id = (followupflagged.followupflag.name && data.messages[i].followupflagged.followupflagId == data.messages[i-1].followupflagged.followupflagId) ?
+                                data.followupflags[data.messages[i].followupflagged.followupflagId-1].id : false;
                                 
-                        followupflagged.isDone = (followupflagged.isDone && data.messages[i].followupflagged.followupflag.isDone == data.messages[i-1].followupflagged.followupflag.isDone) ?
-                                data.messages[i].followupflagged.followupflag.isDone : false;
+                        followupflagged.isDone = (followupflagged.isDone && data.messages[i].followupflagged.isDone == data.messages[i-1].followupflagged.isDone) ?
+                                data.messages[i].followupflagged.isDone : false;
                                 
-                        followupflagged.doneDeadline = (followupflagged.doneDeadline && data.messages[i].followupflagged.followupflag.doneDeadline == data.messages[i-1].followupflagged.followupflag.doneDeadline) ?
-                                Date.parseExact(data.messages[i].followupflagged.followupflag.doneDeadline, 'yyyy-MM-dd hh:mm:ss') : false;
+                        followupflagged.doneDeadline = (followupflagged.doneDeadline && data.messages[i].followupflagged.doneDeadline == data.messages[i-1].followupflagged.doneDeadline) ?
+                                Date.parseExact(data.messages[i].followupflagged.doneDeadline, 'yyyy-MM-dd hh:mm:ss') : false;
                                 
-                        followupflagged.alarmDeadline = (followupflagged.alarmDeadline && data.messages[i].followupflagged.followupflag.alarmDeadline == data.messages[i-1].followupflagged.followupflag.alarmDeadline) ?
-                                Date.parseExact(data.messages[i].followupflagged.followupflag.alarmDeadline, 'yyyy-MM-dd hh:mm:ss') : false;
+                        followupflagged.alarmDeadline = (followupflagged.alarmDeadline && data.messages[i].followupflagged.alarmDeadline == data.messages[i-1].followupflagged.alarmDeadline) ?
+                                Date.parseExact(data.messages[i].followupflagged.alarmDeadline, 'yyyy-MM-dd hh:mm:ss') : false;
                                 
-                        followupflagged.backgroundColor = (followupflagged.backgroundColor && data.messages[i].followupflagged.followupflag.backgroundColor == data.messages[i-1].followupflagged.followupflag.backgroundColor) ?
-                                data.messages[i].followupflagged.followupflag.backgroundColor : false;
+                        followupflagged.backgroundColor = (followupflagged.backgroundColor && data.messages[i].followupflagged.backgroundColor == data.messages[i-1].followupflagged.backgroundColor) ?
+                                data.messages[i].followupflagged.backgroundColor : false;
                 }
         }
@@ -50 +51 @@
                                 <% for(var i=0; i<data.followupflags.length; i++) {  %>
                                         
-                                        <% var selected = (data.followupflags[i].id == followupflagged.followupflagId ) ? 'selected="selected"' : '' %> 
+                                        <% var selected = (data.followupflags[i].id == followupflagged.followupflag.id ) ? 'selected="selected"' : '' %> 
                                         <option value="<%= data.followupflags[i].id %>" <%= selected %>><%= data.followupflags[i].name %></option>
                                 <% } %>