Changeset 6152
- Timestamp:
- 05/09/12 17:51:13 (12 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/js/draw_api.js
r6138 r6152 1680 1680 1681 1681 DataLayer.remove('followupflagged', false); 1682 DataLayer.get('followupflagged');1683 1682 var flagged = DataLayer.get('followupflagged', {filter: [ 1684 1683 'AND', … … 1697 1696 alarmTime : false, 1698 1697 backgroundColor : '#FF2016', 1699 followupflagId: '1', 1700 followupflag: DataLayer.get('followupflag', '1') 1698 followupflagId: '1' 1701 1699 }; 1702 1700 headers_msgs.followupflagged.id = DataLayer.put('followupflagged', headers_msgs.followupflagged); -
trunk/expressoMail1_2/js/search.js
r6076 r6152 551 551 /**TODO Alterar após melhorias no filtro da camada javascript*/ 552 552 DataLayer.remove('followupflagged', false); 553 DataLayer.get('followupflagged');554 553 var flagged = DataLayer.get('followupflagged', {filter: [ 555 554 'AND', … … 567 566 alarmTime : false, 568 567 backgroundColor : '#FF2016', 569 followupflagId: '1', 570 followupflag: DataLayer.get('followupflag', '1') 568 followupflagId: '1' 571 569 }; 572 570 … … 600 598 }else{ 601 599 $('tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).attr('title', get_lang('Follow up')).find(".flag-edited").css("background", aux.followupflagged.backgroundColor); 602 } 603 var extend = DataLayer.get('followupflagged', { 604 filter: ['AND', ['IN', 'messageNumber', messageClickedId], ['IN', 'folderName', mailbox]], 605 criteria: {deepness: 1} 606 }, true); 607 600 } 608 601 updateCacheFollowupflag(messageClickedId, mailbox, true); 609 602 }); -
trunk/prototype/modules/mail/js/followupflag.js
r6068 r6152 238 238 239 239 DataLayer.commit(false, false, function(data){ 240 followupflags = DataLayer.get('followupflagged',{criteria:{order: 'id'}}, true);241 var id = followupflags[followupflags.length - 1].id;242 winElement.find('[name="followupflagId"]').val(id);243 240 winElement.find('.menu-configure-followupflag .delete').button("option", "disabled", false); 244 241 updateCacheFollowupflag(selectedMessageIds, folders, true); … … 256 253 DataLayer.put('followupflag', {name:winElement.find('[name="name"] option:selected').text(), uid:User.me.id}); 257 254 DataLayer.commit(false, false, function(data){ 258 DataLayer.remove('followupflag', false); 259 DataLayer.get('followupflag'); 260 followupflags = DataLayer.get('followupflag',{criteria:{order: 'id'}}, true); 261 followupflagId = followupflags[followupflags.length - 1].id; 255 $.each(data, function(index, value) { 256 if(typeof value == 'object'){ 257 followupflagId = value.id; 258 } 259 }); 262 260 winElement.find('[name="name"] option[value="custom"]').val(followupflagId); 263 261 saveFollowupflagged();
Note: See TracChangeset
for help on using the changeset viewer.