Skip to content
Browse files

Merge branch 'master' into replication-fix

  • Loading branch information...
2 parents 442d21d + ff803dd commit 621400210c28db1f9e9bcf549a7ebeede6f7dacf @camd camd committed Mar 15, 2013
View
2 templates/runtests/list/_runtest_details.html
@@ -13,7 +13,7 @@
{% if user|has_perm:"library.manage_cases" %}
{% url 'manage_caseversion_edit' caseversion_id=caseversion.id as caseversion_edit_url %}
- <a href="{{ caseversion_edit_url }}" target="_blank" class="case-edit">Edit Case Details</a>
+ <a href="{{ caseversion_edit_url }}" target="_blank" class="detail-case-edit">Edit Case Details</a>
{% endif %}
{% block id %}<strong class="id">#{{ caseversion.case.id }}</strong>{% endblock id %}
View
8 templates/runtests/list/_runtest_list_item.html
@@ -4,18 +4,17 @@
{% result_for runcaseversion user environment as result %}
{% other_result_for runcaseversion user environment as other_result %}
{% suites_for run runcaseversion as suites %}
+{% url "results_results" rcv_id=runcaseversion.id as result_url %}
<article id="test-id-{{ runcaseversion.id }}" class="listitem {{ result.status }}" data-title="{{ caseversion.name }}">
<div class="itemhead">
<div class="results">
- <span class="result {{ result.status }}" title="your result">
{% if result.status == result.STATUS.assigned or result.status == result.STATUS.started %}
- pending
+ <span class="result {{ result.status }}">pending</span>
{% else %}
- {{ result.status }}
+ <a class="result {{ result.status }}" href="{{ result_url }}" target="_blank" data-id="{{ result.id }}" title="your result">{{ result.status }}</a>
{% endif %}
- </span>
</div>
{% if result.status == result.STATUS.passed or result.status == result.STATUS.invalidated or result.status == result.STATUS.failed %}
@@ -27,7 +26,6 @@
<div class="other-result">
{% if other_result and other_result.status != result.STATUS.assigned and other_result.status != result.STATUS.started %}
- {% url "results_results" rcv_id=runcaseversion.id as detail_url %}
<a href="{{ detail_url }}" target="_blank" class="other-{{ other_result.status }}" data-id="{{ other_result.id }}" title="marked {{ other_result.status }} by {{ other_result.tester }} {% if other_result.comment %} - {{ other_result.comment }}{% endif %}"></a>
{% else %}
<span class="other-empty"></span>

0 comments on commit 6214002

Please sign in to comment.
Something went wrong with that request. Please try again.