Changeset 6268

Timestamp:

05/22/12 15:27:15 (12 years ago)

Author:

thiago

Message:

Ticket #2782 - Tela de filtros não exibe regra 'fora do escritório'.

File:

• trunk/prototype/modules/filters/filter-list.ejs (modified) (4 diffs)

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

@@ -1 +1 @@
 <ul class="rule-list">
 <%
+        
         data.rules = (data.rules || []);
+        for (var i=0; i<data.rules.length; i++) {
         
-        for (var i=0; i<data.rules.length; i++) {
-        if(typeof data.rules[i].criteria == "undefined") continue;
-        
+        if(typeof data.rules[i].criteria == "undefined" && data.rules[i].id != "vacation") continue;
+
 %>
-                <% if(data.rules[i].id == "") continue %>
                 <li class="rule <%= (data.rules[i].id=='vacation')?'vacation':'' %>" title="<%= data.rules[i].id %>">
                         <strong class="title <%= (data.rules[i].enabled == "true")? 'enable':'disable' %>"><%= (data.rules[i].name ? data.rules[i].name : data.rules[i].id)%></strong>
@@ -16 +16 @@
                                         <ul class="rule-briefing-criteria-list">
                                         <% 
+                                        if(data.rules[i].id != "vacation"){
                                                 for (var j=0; j<data.rules[i].criteria.length; j++) {
                                         %>
@@ -21 +22 @@
                                         <%
                                                 }
+                                        } else {
                                         %>
+                                        <li><br></li>
+                                        <% } %>
+                                        
                                         </ul>
                                 </dd>
@@ -51 +56 @@
 <fieldset class="fields-selected-itens ui-corner-all">
         <legend>Selecionadas</legend>
-        <a href="#" class="button allenable"  title="Habilitar regras selecionadas"><%= get_lang("Enable")%></a>
-        <a href="#" class="button alldisable" title="Desabilitar regras selecionadas"><%= get_lang("Disable")%></a>
-        <a href="#" class="button alldelete"  title="Excluir regras selecionadas"><%= get_lang("Delete")%></a>
+        <a href="#" class="button allenable"  title="Habilitar regras selecionadas">Habilitar</a>
+        <a href="#" class="button alldisable" title="Desabilitar regras selecionadas">Desabilitar</a>
+        <a href="#" class="button alldelete"  title="Excluir regras selecionadas">Excluir</a>
 </fieldset>