Changeset 5599
- Timestamp:
- 03/01/12 14:46:00 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/prototype/modules/mail/templates/followupflag_configure.ejs
r5585 r5599 7 7 if (followupflagged.alarmDeadline) 8 8 followupflagged.alarmDeadline = Date.parseExact(followupflagged.alarmDeadline, 'yyyy-MM-dd hh:mm:ss'); 9 followupflagged.followupflag.id = data.followupflags[data.messages[0].followupflagged.followupflagId-1].id;9 10 10 } else if (data.messages.length > 1) { 11 11 var followupflagged = { … … 24 24 break; 25 25 } 26 27 followupflagged.followupflag.id = (followupflagged.followupflag.name && data.messages[i].followupflagged.followupflagId == data.messages[i-1].followupflagged.followupflagId) ? 28 data.followupflags[data.messages[i].followupflagged.followupflagId-1].id : false; 26 followupflagged.followupflag.name = (followupflagged.followupflag.name && data.messages[i].followupflagged.followupflag.name == data.messages[i-1].followupflagged.followupflag.name) ? 27 data.messages[i].followupflagged.followupflag.name : false; 29 28 30 followupflagged.isDone = (followupflagged.isDone && data.messages[i].followupflagged. isDone == data.messages[i-1].followupflagged.isDone) ?31 data.messages[i].followupflagged. isDone : false;29 followupflagged.isDone = (followupflagged.isDone && data.messages[i].followupflagged.followupflag.isDone == data.messages[i-1].followupflagged.followupflag.isDone) ? 30 data.messages[i].followupflagged.followupflag.isDone : false; 32 31 33 followupflagged.doneDeadline = (followupflagged.doneDeadline && data.messages[i].followupflagged. doneDeadline == data.messages[i-1].followupflagged.doneDeadline) ?34 Date.parseExact(data.messages[i].followupflagged. doneDeadline, 'yyyy-MM-dd hh:mm:ss') : false;32 followupflagged.doneDeadline = (followupflagged.doneDeadline && data.messages[i].followupflagged.followupflag.doneDeadline == data.messages[i-1].followupflagged.followupflag.doneDeadline) ? 33 Date.parseExact(data.messages[i].followupflagged.followupflag.doneDeadline, 'yyyy-MM-dd hh:mm:ss') : false; 35 34 36 followupflagged.alarmDeadline = (followupflagged.alarmDeadline && data.messages[i].followupflagged. alarmDeadline == data.messages[i-1].followupflagged.alarmDeadline) ?37 Date.parseExact(data.messages[i].followupflagged. alarmDeadline, 'yyyy-MM-dd hh:mm:ss') : false;35 followupflagged.alarmDeadline = (followupflagged.alarmDeadline && data.messages[i].followupflagged.followupflag.alarmDeadline == data.messages[i-1].followupflagged.followupflag.alarmDeadline) ? 36 Date.parseExact(data.messages[i].followupflagged.followupflag.alarmDeadline, 'yyyy-MM-dd hh:mm:ss') : false; 38 37 39 followupflagged.backgroundColor = (followupflagged.backgroundColor && data.messages[i].followupflagged. backgroundColor == data.messages[i-1].followupflagged.backgroundColor) ?40 data.messages[i].followupflagged. backgroundColor : false;38 followupflagged.backgroundColor = (followupflagged.backgroundColor && data.messages[i].followupflagged.followupflag.backgroundColor == data.messages[i-1].followupflagged.followupflag.backgroundColor) ? 39 data.messages[i].followupflagged.followupflag.backgroundColor : false; 41 40 } 42 41 } … … 51 50 <% for(var i=0; i<data.followupflags.length; i++) { %> 52 51 53 <% var selected = (data.followupflags[i].id == followupflagged.followupflag .id ) ? 'selected="selected"' : '' %>52 <% var selected = (data.followupflags[i].id == followupflagged.followupflagId ) ? 'selected="selected"' : '' %> 54 53 <option value="<%= data.followupflags[i].id %>" <%= selected %>><%= data.followupflags[i].name %></option> 55 54 <% } %>
Note: See TracChangeset
for help on using the changeset viewer.