diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/error-details.html | 13 | ||||
| -rw-r--r-- | templates/latest-errors.html | 27 |
2 files changed, 32 insertions, 8 deletions
diff --git a/templates/error-details.html b/templates/error-details.html index 62ec75f..c30160d 100644 --- a/templates/error-details.html +++ b/templates/error-details.html @@ -9,7 +9,11 @@ <a class="btn pull-left back-btn" style="margin-top:7px;" href="#"> <i class="icon-arrow-left"></i> </a> - <h1 style="margin-left:60px;">{{detail.RECIPE}}-{{detail.RECIPE_VERSION}} {{detail.TASK}} </h1> + <h1 style="margin-left:60px;"> + {% if detail.BUILD.ERROR_TYPE == error_types.RECIPE %} + {{detail.RECIPE}}-{{detail.RECIPE_VERSION}} + {% endif %} + {{detail.TASK}} </h1> </div> <div class="row span8"> <pre>{{detail.ERROR_DETAILS}}</pre> @@ -20,12 +24,19 @@ <dl class="dl-vertical"> <dt>Submitted on:</dt> <dd>{{ detail.BUILD.DATE|date:"d/m/y H:i"}}</dd> + <dt>Error type:</dt> + <dd>{{ detail.BUILD.get_ERROR_TYPE_display }}</dd> + {% if detail.BUILD.ERROR_TYPE == error_types.RECIPE %} <dt>Task:</dt> <dd>{{ detail.TASK }}</dd> <dt>Recipe:</dt> <dd>{{detail.RECIPE }} </dd> <dt>Recipe version:</dt> <dd>{{ detail.RECIPE_VERSION }}</dd> + {% else %} + <dt>Command:</dt> + <dd>{{ detail.TASK }}</dd> + {% endif %} <dt>Machine:</dt> <dd>{{ detail.BUILD.MACHINE }}</dd> <dt>Distro:</dt> diff --git a/templates/latest-errors.html b/templates/latest-errors.html index 56f612a..87e30d8 100644 --- a/templates/latest-errors.html +++ b/templates/latest-errors.html @@ -107,6 +107,8 @@ <a href="#" class="sort-col sorted" data-order-by="-{{col.field}}" >{{col.name}}</a> <span class="sorting-arrows" style="visibility: visible">▼</span> + {% elif col.clclass == "failure" %} + {{col.name}} {% else %} <a href="#" class="sort-col" data-order-by="{{col.field}}" >{{col.name}}</a> @@ -127,18 +129,29 @@ {% url "details" build_fail.id as details_url %} <tr class="data"> <td class="submitted_on"> <a href="{{details_url}}">{{ build_fail.BUILD.DATE|date:"d/m/y H:i"}}</a></td> - <td class="recipe"><a href="{{details_url}}">{{ build_fail.RECIPE }}</a> - <a class="filter" href="#" data-filter="{{build_fail.RECIPE}}" data-type="recipe"> - <i class="icon-filter hover" title="Filter by {{build_fail.RECIPE}}"></i> + + <td class="error_type"><a href="{{details_url}}">{{ build_fail.BUILD.get_ERROR_TYPE_display }}</a> + <a class="filter" href="#" data-filter="{{build_fail.BUILD.get_ERROR_TYPE_display}}" data-type="error_type"> + <i class="icon-filter hover" title="Filter by {{build_fail.BUILD.get_ERROR_TYPE_display}}"></i> </a> </td> - <td class="recipe_version"><a href="{{details_url}}" {% if build_fail.RECIPE_VERSION|length > 13 %}class="tooltip-me" data-toggle="tooltip" title="{{ build_fail.RECIPE_VERSION }}"{%endif%}>{{ build_fail.RECIPE_VERSION|truncatechars:13 }}</a></td> - <td class="task"><a href="{{details_url}}">{{ build_fail.TASK }}</a> - <a class="filter" href="#" data-filter="{{build_fail.TASK}}" data-type="task"> + + <td class="failure"> + {% if build_fail.BUILD.ERROR_TYPE == error_types.RECIPE %} + <a href="{{details_url}}"> + {{ build_fail.RECIPE }}: + {{ build_fail.TASK }}</a> + <a class="filter" href="#" data-filter=" {{ build_fail.RECIPE }}: {{build_fail.TASK}}" data-type="failure"> + <i class="icon-filter hover" title="Filter by {{ build_fail.RECIPE }}: {{build_fail.TASK}}"></i> + </a> + {% else %} + <a href="{{details_url}}">{{ build_fail.TASK }}</a> + <a class="filter" href="#" data-filter="{{build_fail.TASK}}" data-type="failure"> <i class="icon-filter hover" title="Filter by {{build_fail.TASK}}"></i> </a> - + {% endif %} </td> + <td class="machine"><a href="{{details_url}}">{{ build_fail.BUILD.MACHINE }}</a> <a class="filter" href="#" data-filter="{{build_fail.BUILD.MACHINE}}" data-type="machine"> <i class="icon-filter hover" title="Filter by {{build_fail.BUILD.MACHINE}}"></i> |