Commit 62353243 authored by Leonidas Poulopoulos's avatar Leonidas Poulopoulos

Merged outofsync with error in UI. Closes #1793

parent 138e4e37
......@@ -225,7 +225,7 @@ function delete_route(route){
<table cellpadding="0" cellspacing="0" border="0" class="display" style='width:200px;'>
<tbody>
<tr>
<th>ACTIVE</th><th>SUSPENDED</th><th>OUTOFSYNC</th><th>ERROR</th><th>PENDING</th>
<th>ACTIVE</th><th>SUSPENDED</th><th>ERROR</th><th>PENDING</th>
</tr>
<tr class="on_off">
<td>
......@@ -234,12 +234,7 @@ function delete_route(route){
<td>
<input type="checkbox" class="onoff" name="status_filter" value="SUSPENDED" id="show_inactive"/>
</td>
<td>
<input type="checkbox" class="onoff" name="status_filter" value="OUTOFSYNC" id="show_outofsync"/>
</td>
</td>
<td>
<input type="checkbox" class="onoff" name="status_filter" value="ERROR" id="show_error"/>
</td>
......@@ -281,10 +276,10 @@ function delete_route(route){
<td>{{ route.get_match|safe|escape }}</td>
<td style="text-align: center;">{{route.get_then|safe|escape}}</td>
<td style="text-align: center; "><span
{% if route.status == 'EXPIRED' or route.status == 'ADMININACTIVE' or route.status == 'INACTIVE' %}
{% if route.status == 'EXPIRED' or route.status == 'ADMININACTIVE' or route.status == 'INACTIVE' or route.status == 'OUTOFSYNC'%}
class="statustootipclass"
style="border-bottom:1px dotted red;"
title = "{% ifequal route.status 'INACTIVE' %}Suspended by user{% else %}{% ifequal route.status 'ADMININACTIVE' %}Suspended by administrator{% else %}{% ifequal route.status 'EXPIRED' %}Suspended due to expiration{% endifequal %}{% endifequal %}{% endifequal %}"{% endif %}>{% if route.status == 'EXPIRED' or route.status == 'ADMININACTIVE' or route.status == 'INACTIVE' %}SUSPENDED{% else %}{{route.status}}{% endif %}</span></td>
title = "{% ifequal route.status 'INACTIVE' %}Suspended by user{% else %}{% ifequal route.status 'ADMININACTIVE' %}Suspended by administrator{% else %}{% ifequal route.status 'EXPIRED' %}Suspended due to expiration{% else %}{% ifequal route.status 'OUTOFSYNC' %}Syncronization error. Configuration in device deffers from rule{% endifequal %}{% endifequal %}{% endifequal %}{% endifequal %}"{% endif %}>{% if route.status == 'EXPIRED' or route.status == 'ADMININACTIVE' or route.status == 'INACTIVE' %}SUSPENDED{% else %}{% if route.status == 'OUTOFSYNC' %}ERROR{% else %}{{route.status}}{% endif %}{% endif %}</span></td>
{% comment %}<td style="text-align: center;">{{ route.response }}</td>{% endcomment %}
<td style="text-align: center;">{{ route.applier }}</td>
<td style="text-align: center;"><span {% if route.days_to_expire %}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment