Changeset 8167 for trunk/prototype/modules
- Timestamp:
- 05/31/13 18:50:29 (11 years ago)
- Location:
- trunk/prototype/modules
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/prototype/modules/filters/edit-filter.ejs
r7892 r8167 128 128 %> 129 129 </select> 130 <input type="checkbox" name="actionType[]" value="alertMessage" class="alertMessage"/> 131 <label><%= get_lang("Alert message filter by sender")%></label> 130 <% 131 if(preferences['use_alert_filter_criteria'] == "1") 132 {%> 133 <input type="checkbox" name="actionType[]" value="alertMessage" class="alertMessage"/> 134 <label><%= get_lang("Alert message filter by sender")%></label> 135 <%}%> 132 136 </fieldset> 133 137 <fieldset> -
trunk/prototype/modules/filters/filters.js
r8100 r8167 2 2 * Retorna as regras por remetente e que o usuário deseja ser avisado 3 3 */ 4 function getFromAlertRules() { 5 var filters = DataLayer.get("filter"); 6 fromRules = []; 7 var alertMessage; 8 var active; 9 for (var index in filters) { 10 alertMessage = filters[index]['alertMessage']; 11 active = filters[index]['enabled']; 12 for(var criterias in filters[index]['actions']) { 13 if (filters[index]['actions'][criterias]['type'] == 'fileinto' && alertMessage == 'true' && active == 'true') 14 fromRules[fromRules.length] = filters[index]['actions'][criterias]['parameter']; 15 } 16 } 17 return fromRules; 4 function getFromAlertRules() { 5 fromRules = []; 6 if(preferences['use_alert_filter_criteria'] == "1") 7 { 8 var filters = DataLayer.get("filter"); 9 var alertMessage; 10 var active; 11 for (var index in filters) { 12 alertMessage = filters[index]['alertMessage']; 13 active = filters[index]['enabled']; 14 for(var criterias in filters[index]['actions']) { 15 if (filters[index]['actions'][criterias]['type'] == 'fileinto' && alertMessage == 'true' && active == 'true') 16 fromRules[fromRules.length] = filters[index]['actions'][criterias]['parameter']; 17 } 18 } 19 20 } 21 return fromRules; 18 22 } 19 23 … … 401 405 }); 402 406 403 404 fromRules = getFromAlertRules(); 407 if(preferences['use_alert_filter_criteria'] == "1") 408 { 409 fromRules = getFromAlertRules(); 410 } 405 411 406 412 var BASE_PATH = '../prototype/'; … … 1042 1048 } 1043 1049 } 1044 $.each(fromRules, function(index, value) { 1045 if(value == folder){ 1046 for(var i=0; i < filters_c['criteria'].length; i++){ 1047 if(filters_c['criteria'][i].field == 'from'){ 1048 from = filters_c['criteria'][i].value; 1049 } 1050 } 1051 cExecute ("$this.imap_functions.removeFlagMessagesFilter&folder="+folder+"&from="+from, function(){}); 1052 return false; 1053 } 1054 }); 1055 } 1050 1051 if(preferences['use_alert_filter_criteria'] == "1") 1052 { 1053 $.each(fromRules, function(index, value) { 1054 if(value == folder){ 1055 for(var i=0; i < filters_c['criteria'].length; i++){ 1056 if(filters_c['criteria'][i].field == 'from'){ 1057 from = filters_c['criteria'][i].value; 1058 } 1059 } 1060 cExecute ("$this.imap_functions.removeFlagMessagesFilter&folder="+folder+"&from="+from, function(){}); 1061 return false; 1062 } 1063 }); 1064 } 1065 } -
trunk/prototype/modules/mail/js/followupflag.js
r8153 r8167 775 775 776 776 } 777 778 $('#main_table').ready(function(){ 779 handlerMessageFilter = function (data) { 780 alarmFollowupflagged(null, data); 781 } 782 /* Busca nas pastas indexadas para ver se há novas mensagens com a flag $FilteredMessage */ 783 cExecute ("$this.imap_functions.getFlaggedAlertMessages&folders="+fromRules, handlerMessageFilter); 784 }); 785 777 778 if(preferences['use_alert_filter_criteria'] == "1") 779 { 780 $('#main_table').ready(function(){ 781 handlerMessageFilter = function (data) { 782 alarmFollowupflagged(null, data); 783 } 784 /* Busca nas pastas indexadas para ver se há novas mensagens com a flag $FilteredMessage */ 785 cExecute ("$this.imap_functions.getFlaggedAlertMessages&folders="+fromRules, handlerMessageFilter); 786 }); 787 } 788 789 -
trunk/prototype/modules/mail/js/label.js
r7788 r8167 199 199 winElement.find('.edit').unbind("click").click(editLabel); 200 200 winElement.find('.close').click(deleteLabel); 201 202 draw_tree_labels();201 if( preferences['use_followupflags_and_labels'] == "1" ) 202 draw_tree_labels(); 203 203 var msgsReference = DataLayer.get('labeled', {filter: ['=', 'labelId', ''+labelEdited.id]}, true); 204 204 updateMessageLabels(msgsReference); … … 326 326 .find("li:first") 327 327 .fadeIn("slow").click(configureLabel); 328 329 draw_tree_labels();328 if( preferences['use_followupflags_and_labels'] == "1" ) 329 draw_tree_labels(); 330 330 331 331 $(".label-list-container .label-list li").not(".empty-item").click(function(){ -
trunk/prototype/modules/mail/templates/detailedfoldertree.ejs
r8109 r8167 5 5 Inbox: {name:'Caixa de Entrada', classe:'inbox'}, 6 6 }; 7 specialFolders[outboxfolder] = {name: 'Caixa de Sa ída', classe:'outbox'};7 specialFolders[outboxfolder] = {name: 'Caixa de Saï¿œda', classe:'outbox'}; 8 8 specialFolders[trashfolder] = {name:'Lixeira', classe:'trash'}; 9 9 specialFolders[draftsfolder] = {name:'Rascunhos', classe:'drafts'}; … … 67 67 68 68 <%}%> 69 <% if(preferences['use_followupflags_and_labels'] == "1"){%> 69 70 <li><span class="folder head_folder all_accomp followup-messages">Para acompanhamento</span> 71 <%}%> 70 72 </li> 71 73 </ul>
Note: See TracChangeset
for help on using the changeset viewer.