Changeset 5591

Timestamp:

02/29/12 17:58:47 (11 years ago)

Author:

gustavo

Message:

Ticket #2088 - Melhorias no editor de regras de filtro de mensagens do Expresso

Location:

trunk/prototype/modules/filters

Files:

• edit-filter.ejs (modified) (4 diffs)
• filters.js (modified) (4 diffs)

trunk/prototype/modules/filters/edit-filter.ejs

@@ -74 +74 @@
                         <fieldset class="fields-isexact">
                                 <fieldset>
-                                        <input type="radio" name="isExact" value="and"/>
+                                        <input type="radio" name="isExact" value="and" checked="checked"/>
                                         <label>Atender a todos os critérios</label>
                                 </fieldset>
@@ -94 +94 @@
                         </ul>
                         <fieldset class="select-folderlist">
-                                <input type="radio" name="actionType[]" value="fileinto" />
+                                <input type="radio" name="actionType[]" value="fileinto" checked="checked" onchange="$('.ui-widget-content :checkbox').parent().removeClass(' hidden');"/>
                                 <label>Arquivar na pasta</label>
                                 <!-- 
@@ -111 +111 @@
                         </fieldset>
                         <fieldset>
-                                <input type="radio" name="actionType[]" value="redirect" />
+                                <input type="radio" name="actionType[]" value="redirect" onchange="$('.ui-widget-content :checkbox').parent().removeClass(' hidden');"/>
                                 <label>Encaminhar para o endereço</label>
                                 <input type="text" name="addressRedirect" />
                         </fieldset>
                         <fieldset>
-                                <input type="radio" name="actionType[]" value="setflag" />
+                                <input type="radio" name="actionType[]" value="setflag" onchange="$('.ui-widget-content :checkbox').parent().removeClass(' hidden');"/>
                                 <label>Marcar como</label>
                                 <!--
@@ -128 +128 @@
                         </fieldset>
                         <fieldset>
-                                <input type="radio" name="actionType[]" value="fileintoTrash" />
+                                <input type="radio" name="actionType[]" value="fileintoTrash" onchange="$('.ui-widget-content :checkbox').parent().removeClass(' hidden');"/>
                                 <label>Mover para a Lixeira</label>
                                 <input type="hidden" name="actionParameter[]" value="Trash"/>
                         </fieldset>
                         <fieldset class="fields-replyto">
-                                <input type="radio" name="actionType[]" value="reject"/>
+                                <input type="radio" name="actionType[]" value="reject" onchange="$('.ui-widget-content :checkbox').parent().addClass(' hidden');"/>
                                 <label>Responder com uma mensagem automaticamente</label>
                                 <textarea name="messageReject"></textarea>

trunk/prototype/modules/filters/filters.js

@@ -1 @@
- 
+valid_save = function(){
+        if($('[name="name"]').attr("disabled") != "disabled")
+        {
+                if($.trim($('[name="name"]').val()) == ""){
+                        alert("Nenhum nome preenchido");
+                        return false;
+                }else if($.trim($('[name="name"]').val()) == "vacation"){
+                        alert("Nome inválido, 'vacation' é uma palavra reservada");
+                        return false;
+                }else{
+                        filter_list = DataLayer.get("filter", true);
+                        var error = false;
+                        $.each(filter_list, function(index, value){
+                                if(filter_list[index].name == $('[name="name"]').val()){
+                                        alert("já existe um filtro com este nome");
+                                        error = true;
+                                        return;
+                                }       
+                        });
+                        if(error){
+                                return false;
+                        }
+                }
+        }
+        var criteria = "";
+        var criteria_list = $('[name="criteriaValue[]"]');
+        $.each(criteria_list, function(index, value){
+                criteria += $.trim($(criteria_list[index]).val());
+        });
+        if(criteria == ""){
+                alert("Nenhum criterio preenchido");
+                return false;
+        }
+        if($('[name="actionType[]"]:checked').parent().find("input:text, textarea").length){
+                if($.trim($('[name="actionType[]"]:checked').parent().find("input:text, textarea").val()) == ""){
+                        alert("Preencha o valor da ação");
+                        return false;
+                }
+        }
+        return true;
+};
+
 bytes2Size = function(bytes) {
         var sizes = ['B', 'KB', 'MB', 'GB', 'TB'];
@@ -122 +163 @@
                         }
                         if (type == 'fileintoInbox') { 
-                                type = 'fileinto';
-                                the_parameter = 'INBOX';
+                                if(!$('[value="fileintoInbox"]').parent().hasClass("hidden")){
+                                        type = 'fileinto';
+                                        the_parameter = 'INBOX';
+                                }else{
+                                        return;
+                                }
                         }
                         if (type == 'fileintoTrash') {
@@ -680 +725 @@
                                         if(nameObj)
                                                 nameObj.attr("disabled", "false");
-                                        $(this).submit();
+                                        if(valid_save())
+                                                $(this).submit();
+                                        else
+                                                return;
                                         DataLayer.commit( 'filter' );
                                         DataLayer.render( BASE_PATH + 'modules/filters/init.ejs', {},list_filters);
@@ -749 +797 @@
                                 DataLayer.render( BASE_PATH + 'modules/filters/init.ejs', {},list_filters);
                         }).end().filter(".submit").click(function(){
-                                $(this).submit();
+                                if(valid_save())
+                                        $(this).submit();
+                                else
+                                        return;
                                 DataLayer.commit( 'filter' );
                                 DataLayer.render( BASE_PATH + 'modules/filters/init.ejs', {},list_filters);
                         });
-                        //$(".rule-edit-container").html(html);
                 });     
         });