Changeset 6355 for sandbox/2.4.1-1/prototype
- Timestamp:
- 05/30/12 16:43:39 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sandbox/2.4.1-1/prototype/modules/filters/filters.js
r6326 r6355 6 6 fromRules = []; 7 7 var alertMessage; 8 var active; 8 9 for (var index in filters) { 9 10 alertMessage = filters[index]['alertMessage']; 11 active = filters[index]['enabled']; 10 12 for(var criterias in filters[index]['actions']) { 11 if (filters[index]['actions'][criterias]['type'] == 'fileinto' && alertMessage == 'true' )13 if (filters[index]['actions'][criterias]['type'] == 'fileinto' && alertMessage == 'true' && active == 'true') 12 14 fromRules[fromRules.length] = filters[index]['actions'][criterias]['parameter']; 13 15 } … … 597 599 else 598 600 return; 599 DataLayer.commit( 'filter', false,function(){ 601 DataLayer.commit( 'filter', false,function(data){ 602 if(filters['alertMessage'] == "true"){ 603 if(filters['alertMessage'] != $('.alertMessage').is(':checked').toString()){ 604 /**RETIRA FLAG*/ 605 removeMessagesFlag(filters['id']); 606 } 607 } 600 608 DataLayer.render( BASE_PATH + 'modules/filters/init.ejs', {},list_filters); 601 609 }); … … 630 638 var id = $(this).parents("li.rule").find('.id').val(); 631 639 DataLayer.put( 'filter', id, { enabled: false }); 640 /**RETIRA FLAG*/ 641 removeMessagesFlag(id); 632 642 DataLayer.commit("filter", false,function(){ 633 643 DataLayer.render( BASE_PATH + 'modules/filters/init.ejs', {},list_filters); … … 665 675 DataLayer.remove('filter', false); 666 676 DataLayer.get('filter'); 677 /**RETIRA FLAG*/ 678 removeMessagesFlag(filter_name); 667 679 DataLayer.remove( 'filter', filter_name); 680 668 681 DataLayer.commit("filter", false,function(){ 669 682 DataLayer.render( BASE_PATH + 'modules/filters/init.ejs', {},list_filters); … … 688 701 container.find('.rule-list').find('.rule').find('.select').find(':checked').parents('.rule').find('.title').each(function(i,o){ 689 702 DataLayer.put( 'filter', o.innerHTML, { enabled: false }); 703 /**RETIRA FLAG*/ 704 removeMessagesFlag(o.innerHTML); 690 705 }); 691 706 DataLayer.commit("filter", false, function(){ … … 707 722 DataLayer.get('filter'); 708 723 container.find('.rule-list').find('.rule').find('.select').find(':checked').parents('.rule').find('.title').each(function(i,o){ 724 /**RETIRA FLAG*/ 725 removeMessagesFlag(o.innerHTML); 709 726 DataLayer.remove( 'filter', o.innerHTML ); 727 710 728 }); 711 729 DataLayer.commit("filter", false,function(){ … … 777 795 list_filters(html); 778 796 } 797 798 /* 799 * Ao excluir filtro, desabilitar filtro ou retirar a ação Alerta de um filtro 800 * esta função é chamada para retirar as flags que caracterizam uma mensagem como alertada pelos Filtros por Remetente 801 */ 802 function removeMessagesFlag(id){ 803 var filters_c = DataLayer.get('filter', id); 804 var folder = ''; 805 var from = ''; 806 for(var i=0; i < filters_c['actions'].length; i++){ 807 if(filters_c['actions'][i].type == 'fileinto'){ 808 folder = filters_c['actions'][i].parameter; 809 } 810 } 811 for(var i=0; i < filters_c['criteria'].length; i++){ 812 if(filters_c['criteria'][i].field == 'from'){ 813 from = filters_c['criteria'][i].value; 814 } 815 } 816 cExecute ("$this.imap_functions.removeFlagMessagesFilter&folder="+folder+"&from="+from, function(){}); 817 }
Note: See TracChangeset
for help on using the changeset viewer.