diff --git a/helpdesk/templates/helpdesk/ticket_desc_table.html b/helpdesk/templates/helpdesk/ticket_desc_table.html index 8cf00829..7b9e0295 100644 --- a/helpdesk/templates/helpdesk/ticket_desc_table.html +++ b/helpdesk/templates/helpdesk/ticket_desc_table.html @@ -117,24 +117,9 @@ - {% if helpdesk_settings.HELPDESK_ENABLE_DEPENDENCIES_ON_TICKET != False and helpdesk_settings.HELPDESK_ENABLE_TIME_SPENT_ON_TICKET != False %} - - {% if helpdesk_settings.HELPDESK_ENABLE_DEPENDENCIES_ON_TICKET %} - {% trans "Dependencies" %} - - - {% for dep in ticket.ticketdependency.all %} - {% if forloop.first %}

{% trans "This ticket cannot be resolved until the following ticket(s) are resolved" %}

{% endif %} - {% empty %} - {% trans "This ticket has no dependencies." %} - {% endfor %} - - {% else %} - - - {% endif %} + + {% trans "Status" %} + {{ ticket.get_status }} {% if helpdesk_settings.HELPDESK_ENABLE_TIME_SPENT_ON_TICKET %} {% trans "Total time spent" %} {{ ticket.time_spent_formated }} @@ -142,8 +127,41 @@ {% endif %} - - {% endif %} + + {% if helpdesk_settings.HELPDESK_ENABLE_DEPENDENCIES_ON_TICKET != False %} + + {% trans "Depends" %} + + + + {% for dep in ticket.ticketdependency.all %} + {% if forloop.first %}{% endif %} + {% empty %} + {% trans "This ticket has no dependencies." %} + {% endfor %} + + {% trans "Resolves" %} + + {% for parent in ticket.depends_on.all %} + {% if forloop.first %}{% endif %} + {% empty %} + {% trans "This ticket does not resolve any other" %} + {% endfor %} + + + {% endif %} {% if ticket.kbitem %} {% trans "Knowlegebase item" %}