mirror of
https://github.com/django-helpdesk/django-helpdesk.git
synced 2024-12-13 02:10:49 +01:00
introduce status DUPLICATE. This is somethimes useful.
The number of the original bug can written inside the 'comment / resolution' field.
This commit is contained in:
parent
a780f51466
commit
2577d3704a
@ -230,12 +230,14 @@ class Ticket(models.Model):
|
|||||||
REOPENED_STATUS = 2
|
REOPENED_STATUS = 2
|
||||||
RESOLVED_STATUS = 3
|
RESOLVED_STATUS = 3
|
||||||
CLOSED_STATUS = 4
|
CLOSED_STATUS = 4
|
||||||
|
DUPLICATE_STATUS = 5
|
||||||
|
|
||||||
STATUS_CHOICES = (
|
STATUS_CHOICES = (
|
||||||
(OPEN_STATUS, _('Open')),
|
(OPEN_STATUS, _('Open')),
|
||||||
(REOPENED_STATUS, _('Reopened')),
|
(REOPENED_STATUS, _('Reopened')),
|
||||||
(RESOLVED_STATUS, _('Resolved')),
|
(RESOLVED_STATUS, _('Resolved')),
|
||||||
(CLOSED_STATUS, _('Closed')),
|
(CLOSED_STATUS, _('Closed')),
|
||||||
|
(DUPLICATE_STATUS, _('Duplicate')),
|
||||||
)
|
)
|
||||||
|
|
||||||
PRIORITY_CHOICES = (
|
PRIORITY_CHOICES = (
|
||||||
|
@ -41,7 +41,7 @@
|
|||||||
<li><a href='{% url helpdesk_report_index %}'>{% trans "Stats" %}</a></li>
|
<li><a href='{% url helpdesk_report_index %}'>{% trans "Stats" %}</a></li>
|
||||||
{% if user_saved_queries_ %}
|
{% if user_saved_queries_ %}
|
||||||
<li><a href="#queryloadheader" id="toggle_query">Load Saved Query</a></li>
|
<li><a href="#queryloadheader" id="toggle_query">Load Saved Query</a></li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<li><a href='{% url logout %}'>{% trans "Logout" %}</a></li>
|
<li><a href='{% url logout %}'>{% trans "Logout" %}</a></li>
|
||||||
{% if not query %}<li><form id='searchform' method='get' action='{% url helpdesk_list %}'><input type='text' name='q' size='10' class='input' value='{% trans "Search..." %}' id='search_query' onFocus='s=document.getElementById("search_query");if (s.value == "{% trans "Search..." %}") { s.value = ""; }' title='{% trans "Enter a keyword, or a ticket number to jump straight to that ticket." %}'/><input type='hidden' name='status' value='1' /><input type='hidden' name='status' value='2' /><input type='hidden' name='status' value='3' /><input type='hidden' name='search_type' value='header' />{% csrf_token %}</form></li>{% endif %}
|
{% if not query %}<li><form id='searchform' method='get' action='{% url helpdesk_list %}'><input type='text' name='q' size='10' class='input' value='{% trans "Search..." %}' id='search_query' onFocus='s=document.getElementById("search_query");if (s.value == "{% trans "Search..." %}") { s.value = ""; }' title='{% trans "Enter a keyword, or a ticket number to jump straight to that ticket." %}'/><input type='hidden' name='status' value='1' /><input type='hidden' name='status' value='2' /><input type='hidden' name='status' value='3' /><input type='hidden' name='search_type' value='header' />{% csrf_token %}</form></li>{% endif %}
|
||||||
</ul>
|
</ul>
|
||||||
|
@ -85,12 +85,14 @@
|
|||||||
{% ifequal ticket.status 1 %}
|
{% ifequal ticket.status 1 %}
|
||||||
<dd><input type='radio' name='new_status' value='1' id='st_open' checked='checked'><label for='st_open' class='active'>{% trans "Open" %}</label> »
|
<dd><input type='radio' name='new_status' value='1' id='st_open' checked='checked'><label for='st_open' class='active'>{% trans "Open" %}</label> »
|
||||||
<input type='radio' name='new_status' value='3' id='st_resolved'><label for='st_resolved'>{% trans "Resolved" %}</label> »
|
<input type='radio' name='new_status' value='3' id='st_resolved'><label for='st_resolved'>{% trans "Resolved" %}</label> »
|
||||||
<input type='radio' name='new_status' value='4' id='st_closed'><label for='st_closed'>{% trans "Closed" %}</label></dd>
|
<input type='radio' name='new_status' value='4' id='st_closed'><label for='st_closed'>{% trans "Closed" %}</label> »
|
||||||
|
<input type='radio' name='new_status' value='5' id='st_duplicate'><label for='st_duplicate'>{% trans "Duplicate" %}</label></dd>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
{% ifequal ticket.status 2 %}
|
{% ifequal ticket.status 2 %}
|
||||||
<dd><input type='radio' name='new_status' value='2' id='st_reopened' checked='checked'><label for='st_reopened' class='active'>{% trans "Reopened" %}</label> »
|
<dd><input type='radio' name='new_status' value='2' id='st_reopened' checked='checked'><label for='st_reopened' class='active'>{% trans "Reopened" %}</label> »
|
||||||
<input type='radio' name='new_status' value='3' id='st_resolved'><label for='st_resolved'>{% trans "Resolved" %}</label> »
|
<input type='radio' name='new_status' value='3' id='st_resolved'><label for='st_resolved'>{% trans "Resolved" %}</label> »
|
||||||
<input type='radio' name='new_status' value='4' id='st_closed'><label for='st_closed'>{% trans "Closed" %}</label> </dd>
|
<input type='radio' name='new_status' value='4' id='st_closed'><label for='st_closed'>{% trans "Closed" %}</label> »
|
||||||
|
<input type='radio' name='new_status' value='5' id='st_duplicate'><label for='st_duplicate'>{% trans "Duplicate" %}</label></dd>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
{% ifequal ticket.status 3 %}
|
{% ifequal ticket.status 3 %}
|
||||||
<dd><input type='radio' name='new_status' value='2' id='st_reopened'><label for='st_reopened'>{% trans "Reopened" %}</label> «
|
<dd><input type='radio' name='new_status' value='2' id='st_reopened'><label for='st_reopened'>{% trans "Reopened" %}</label> «
|
||||||
@ -101,6 +103,10 @@
|
|||||||
<dd><input type='radio' name='new_status' value='2' id='st_reopened'><label for='st_reopened'>{% trans "Reopened" %}</label> «
|
<dd><input type='radio' name='new_status' value='2' id='st_reopened'><label for='st_reopened'>{% trans "Reopened" %}</label> «
|
||||||
<input type='radio' name='new_status' value='4' id='st_closed' checked='checked'><label for='st_closed'>{% trans "Closed" %}</label></dd>
|
<input type='radio' name='new_status' value='4' id='st_closed' checked='checked'><label for='st_closed'>{% trans "Closed" %}</label></dd>
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
|
{% ifequal ticket.status 5 %}
|
||||||
|
<dd><input type='radio' name='new_status' value='2' id='st_reopened'><label for='st_reopened'>{% trans "Reopened" %}</label> «
|
||||||
|
<input type='radio' name='new_status' value='5' id='st_duplicate' checked='checked'><label for='st_duplicate'>{% trans "Duplicate" %}</label></dd>
|
||||||
|
{% endifequal %}
|
||||||
|
|
||||||
<dt><label for='id_public'>{% trans "Is this update public?" %}</label> <span class='form_optional'>(Optional)</span></dt>
|
<dt><label for='id_public'>{% trans "Is this update public?" %}</label> <span class='form_optional'>(Optional)</span></dt>
|
||||||
<dd><input type='checkbox' name='public' value='1' checked='checked' /></dD>
|
<dd><input type='checkbox' name='public' value='1' checked='checked' /></dD>
|
||||||
|
Loading…
Reference in New Issue
Block a user