diff --git a/helpdesk/templates/helpdesk/ticket.html b/helpdesk/templates/helpdesk/ticket.html index 50cc3334..470f9dd9 100644 --- a/helpdesk/templates/helpdesk/ticket.html +++ b/helpdesk/templates/helpdesk/ticket.html @@ -21,196 +21,198 @@ {% endblock %} {% block helpdesk_body %} -{% if helpdesk_settings.HELPDESK_TRANSLATE_TICKET_COMMENTS %} -{% comment %} -
{% trans "Translate ticket comments into" %}
-
-{% endcomment %} -
- -{% endif %} + {% if helpdesk_settings.HELPDESK_TRANSLATE_TICKET_COMMENTS %} +
+ + {% endif %} -{% include "helpdesk/ticket_desc_table.html" %} + {% include "helpdesk/ticket_desc_table.html" %} -{% if ticket.followup_set.all %} -{% load ticket_to_link %} -
-
 {% trans "Follow-Ups" %}
-
-
- {% for followup in ticket.followup_set.all %} -
-
-
{{ followup.title }}
-  {% if followup.user %}by {{ followup.user }},{% endif %} {{ followup.date|naturaltime }}{% if followup.time_spent %}, {% trans "time spent" %}: {{ followup.time_spent_formated }}{% endif %} {% if not followup.public %} ({% trans "Private" %}){% endif %} -
-

- {% if followup.comment %} -

{{ followup.get_markdown|urlizetrunc:50|num_to_link|linebreaksbr }}

- {% endif %} - {% for change in followup.ticketchange_set.all %} - {% if forloop.first %}
    {% endif %} -
  • {% blocktrans with change.field as field and change.old_value as old_value and change.new_value as new_value %}Changed {{ field }} from {{ old_value }} to {{ new_value }}.{% endblocktrans %}
    • - {% if forloop.last %}
{% endif %} - {% endfor %} - {% for attachment in followup.followupattachment_set.all %}{% if forloop.first %}{% trans "Attachments" %}:
    {% endif %} -
  • {{ attachment.filename }} ({{ attachment.mime_type }}, {{ attachment.size|filesizeformat }}) - {% if followup.user and request.user == followup.user %} - - {% endif %} -
    • - {% if forloop.last %}
{% endif %} - {% endfor %} -

- - {% with possible=helpdesk_settings.HELPDESK_SHOW_EDIT_BUTTON_FOLLOW_UP %} - {% if possible and followup.user and request.user == followup.user and not followup.ticketchange_set.all or possible and user.is_superuser and helpdesk_settings.HELPDESK_SHOW_DELETE_BUTTON_SUPERUSER_FOLLOW_UP %} - - {% if helpdesk_settings.HELPDESK_SHOW_EDIT_BUTTON_FOLLOW_UP %} - {% if followup.user and request.user == followup.user and not followup.ticketchange_set.all %} - - {% endif %} - {% endif %} - {% if user.is_superuser and helpdesk_settings.HELPDESK_SHOW_DELETE_BUTTON_SUPERUSER_FOLLOW_UP %} - - {% endif %} - - {% endif %}{% endwith %} -
- - {% endfor %} -
- + {% if ticket.merged_to %} +
+

+ {% trans "This ticket has been merged into ticket" %} + {{ ticket.merged_to }} +

- -
- - -{% endif %} -{% if helpdesk_settings.HELPDESK_TRANSLATE_TICKET_COMMENTS %} -
-{% endif %} - -
-
{% trans "Respond to this ticket" %}
-
- -
- -
-
- {% if preset_replies %} -
{% trans "(Optional)" %}
-
-
{% trans "Selecting a pre-set reply will over-write your comment below. You can then modify the pre-set reply to your liking before saving this update." %}
- {% endif %} - -
-
-
{% trans "You can insert ticket and queue details in your message. For more information, see the context help page." %}
- -
- {% if not ticket.can_be_resolved %}
{% trans "This ticket cannot be resolved or closed until the tickets it depends on are resolved." %}
{% endif %} - {% ifequal ticket.status 1 %} -
- - - - -
- {% endifequal %} - {% ifequal ticket.status 2 %} -
- - - - -
- {% endifequal %} - {% ifequal ticket.status 3 %} -
- - - -
- {% endifequal %} - {% ifequal ticket.status 4 %} -
-
- {% endifequal %} - {% ifequal ticket.status 5 %} -
- - -
- {% endifequal %} - - {% if helpdesk_settings.HELPDESK_UPDATE_PUBLIC_DEFAULT %} - - {% else %} -
- {% trans "(Optional)" %} -
-
  {% trans 'Yes, make this update public.' %}
-
{% trans "If this is public, the submitter will be e-mailed your comment or resolution." %}
- {% endif %} - - {% if user.is_staff %} -
- {% trans "(Optional)" %} -
-
- {% endif %} -
- -

- - - -

- - + {% endif %} -
+
+
{% trans "Respond to this ticket" %}
+
- + -{% csrf_token %} +
+
+ {% if preset_replies %} +
{% trans "(Optional)" %}
+
+
{% trans "Selecting a pre-set reply will over-write your comment below. You can then modify the pre-set reply to your liking before saving this update." %}
+ {% endif %} -
-
+
+
+
{% trans "You can insert ticket and queue details in your message. For more information, see the context help page." %}
+ +
+ {% if not ticket.can_be_resolved %}
{% trans "This ticket cannot be resolved or closed until the tickets it depends on are resolved." %}
{% endif %} + {% ifequal ticket.status 1 %} +
+ + + + +
+ {% endifequal %} + {% ifequal ticket.status 2 %} +
+ + + + +
+ {% endifequal %} + {% ifequal ticket.status 3 %} +
+ + + +
+ {% endifequal %} + {% ifequal ticket.status 4 %} +
+
+ {% endifequal %} + {% ifequal ticket.status 5 %} +
+ + +
+ {% endifequal %} + + {% if helpdesk_settings.HELPDESK_UPDATE_PUBLIC_DEFAULT %} + + {% else %} +
+ {% trans "(Optional)" %} +
+
  {% trans 'Yes, make this update public.' %}
+
{% trans "If this is public, the submitter will be e-mailed your comment or resolution." %}
+ {% endif %} + + {% if user.is_staff %} +
+ {% trans "(Optional)" %} +
+
+ {% endif %} + + +

+ + + +

+ + + + + + + + {% csrf_token %} + +
+
+ {% endif %} {% endblock %}