Changeset 5571 for trunk/prototype/modules/mail/templates/followupflag_configure.ejs

Timestamp:

02/28/12 08:12:32 (12 years ago)

Author:

adriano

Message:

Ticket #2486 - correcoes de diversos bugs e refactory de parte do codigo dos alarms

File:

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

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

@@ -40 +40 @@
                 }
         }
-typeFlag = DataLayer.get("followupflag", id = data.messages[0].followupflagged.followupflagId ).name;
-//followupflagged.followupflag.name
 %>
 <div class="followupflag-container">
@@ -52 +50 @@
                                 <% for(var i=0; i<data.followupflags.length; i++) {  %>
                                         
-                                        <% var selected = (data.followupflags[i].name == typeFlag ) ? 'selected="selected"' : '' %> 
+                                        <% var selected = (data.followupflags[i].id == followupflagged.followupflagId ) ? 'selected="selected"' : '' %> 
                                         <option value="<%= data.followupflags[i].id %>" <%= selected %>><%= data.followupflags[i].name %></option>
                                 <% } %>
@@ -87 +85 @@
                                 }
                         %>
-                        <select id="selectCor" name="setColor">
-                                <option value="default" <%= (defaultColor) ? 'selected="selected"' : ''%> ><%= get_lang("Default")%></option>
-                                <option value="custom" <%= (!defaultColor) ? 'selected="selected"' : ''%> ><%= get_lang("Custom")%></option>
+                        <select name="setColor">
+                                <option value="default" <%= (defaultColor && !followupflagged.backgroundColor) ? 'selected="selected"' : ''%> ><%= get_lang("Default")%></option>
+                                <option value="custom" <%= (!defaultColor && followupflagged.backgroundColor) ? 'selected="selected"' : ''%> ><%= get_lang("Custom")%></option>
                         </select>
                 </div>
@@ -116 +114 @@
         </div>
 </div> 
-
-<!--
-        TODO
-        ** Vai ter que ser arrumado a parte de buscar o tipo do sinalizador atual.
--->