diff --git a/docs/settings.rst b/docs/settings.rst index 362241ad..d8f5f7af 100644 --- a/docs/settings.rst +++ b/docs/settings.rst @@ -94,6 +94,14 @@ These changes are visible throughout django-helpdesk **Default:** ``HELPDESK_ANON_ACCESS_RAISES_404 = False`` +- **HELPDESK_ENABLE_DEPENDENCIES_ON_TICKET** If False, disable the dependencies fields on ticket. + + **Default:** ``HELPDESK_ENABLE_DEPENDENCIES_ON_TICKET = True`` + +- **HELPDESK_ENABLE_TIME_SPENT_ON_TICKET** If False, disable the time spent fields on ticket. + + **Default:** ``HELPDESK_ENABLE_TIME_SPENT_ON_TICKET = True`` + - **HELPDESK_TICKETS_TIMELINE_ENABLED** If False, remove from the dashboard the Timeline view for tickets. **Default:** ``HELPDESK_TICKETS_TIMELINE_ENABLED = True`` diff --git a/helpdesk/settings.py b/helpdesk/settings.py index 31a1f742..4b5fb7bb 100644 --- a/helpdesk/settings.py +++ b/helpdesk/settings.py @@ -41,6 +41,16 @@ HELPDESK_REDIRECT_TO_LOGIN_BY_DEFAULT = getattr(settings, 'HELPDESK_REDIRECT_TO_LOGIN_BY_DEFAULT', False) +# Enable the Dependencies field on ticket view +HELPDESK_ENABLE_DEPENDENCIES_ON_TICKET = getattr(settings, + 'HELPDESK_ENABLE_DEPENDENCIES_ON_TICKET', + True) + +# Enable the Time spent on field on ticket view +HELPDESK_ENABLE_TIME_SPENT_ON_TICKET = getattr(settings, + 'HELPDESK_ENABLE_TIME_SPENT_ON_TICKET', + True) + # raises a 404 to anon users. It's like it was invisible HELPDESK_ANON_ACCESS_RAISES_404 = getattr(settings, 'HELPDESK_ANON_ACCESS_RAISES_404', diff --git a/helpdesk/templates/helpdesk/followup_edit.html b/helpdesk/templates/helpdesk/followup_edit.html index e74e3203..af61e6e1 100644 --- a/helpdesk/templates/helpdesk/followup_edit.html +++ b/helpdesk/templates/helpdesk/followup_edit.html @@ -46,8 +46,10 @@
{{ form.new_status }}

If the status was changed, what was it changed to?

+ {% if helpdesk_settings.HELPDESK_ENABLE_TIME_SPENT_ON_TICKET %}
{{ form.time_spent }}
+ {% endif %}

{% csrf_token %} diff --git a/helpdesk/templates/helpdesk/report_index.html b/helpdesk/templates/helpdesk/report_index.html index 4d82f40c..63194afb 100644 --- a/helpdesk/templates/helpdesk/report_index.html +++ b/helpdesk/templates/helpdesk/report_index.html @@ -45,7 +45,7 @@ {% trans "Open" %} {% trans "Resolved" %} {% trans "Closed" %} - {% trans "Time spent" %} + {% if helpdesk_settings.HELPDESK_ENABLE_TIME_SPENT_ON_TICKET %}{% trans "Time spent" %}{% endif %} @@ -55,7 +55,7 @@ {% if queue.open %}{% endif %}{{ queue.open }}{% if queue.open %}{% endif %} {% if queue.resolved %}{% endif %}{{ queue.resolved }}{% if queue.resolved %}{% endif %} {% if queue.closed %}{% endif %}{{ queue.closed }}{% if queue.closed %}{% endif %} - {{ queue.time_spent }}{% if queue.dedicated_time %} / {{ queue.dedicated_time }}{% endif %} + {% if helpdesk_settings.HELPDESK_ENABLE_TIME_SPENT_ON_TICKET %}{{ queue.time_spent }}{% if queue.dedicated_time %} / {{ queue.dedicated_time }}{% endif %}{% endif %} {% empty %} {% trans "There are no unassigned tickets." %} diff --git a/helpdesk/templates/helpdesk/ticket.html b/helpdesk/templates/helpdesk/ticket.html index 5eade600..ff0a3fa8 100644 --- a/helpdesk/templates/helpdesk/ticket.html +++ b/helpdesk/templates/helpdesk/ticket.html @@ -46,7 +46,7 @@
{{ followup.title|num_to_link }}
-   +  

{% if followup.comment %} @@ -156,12 +156,14 @@

{% trans "If this is public, the submitter will be e-mailed your comment or resolution." %}
{% endif %} + {% if helpdesk_settings.HELPDESK_ENABLE_TIME_SPENT_ON_TICKET %} {% if user.is_staff %}
{% trans "(Optional)" %}
{% endif %} + {% endif %}

diff --git a/helpdesk/templates/helpdesk/ticket_desc_table.html b/helpdesk/templates/helpdesk/ticket_desc_table.html index 36df46fb..4a09a58b 100644 --- a/helpdesk/templates/helpdesk/ticket_desc_table.html +++ b/helpdesk/templates/helpdesk/ticket_desc_table.html @@ -70,7 +70,9 @@ {{ ticketcc_string }} {% if SHOW_SUBSCRIBE %} {% endif %} + {% 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" %} @@ -82,9 +84,19 @@ {% trans "This ticket has no dependencies." %} {% endfor %} + {% else %} + + + {% endif %} + {% if helpdesk_settings.HELPDESK_ENABLE_TIME_SPENT_ON_TICKET %} {% trans "Total time spent" %} {{ ticket.time_spent_formated }} + {% else %} + + + {% endif %} + {% endif %} {% if ticket.kbitem %} {% trans "Knowlegebase item" %} diff --git a/helpdesk/templates/helpdesk/ticket_list.html b/helpdesk/templates/helpdesk/ticket_list.html index fad94e25..b8aa32f7 100644 --- a/helpdesk/templates/helpdesk/ticket_list.html +++ b/helpdesk/templates/helpdesk/ticket_list.html @@ -76,8 +76,8 @@ {% trans "Due Date" %} {% trans "Owner" %} {% trans "Submitter" %} - {% trans "Time Spent" %} - {% trans "KB item" %} + {% if helpdesk_settings.HELPDESK_ENABLE_TIME_SPENT_ON_TICKET %}{% trans "Time Spent" %}{% endif %} + {% if helpdesk_settings.HELPDESK_KB_ENABLED %}{% trans "KB item" %}{% endif %} @@ -412,8 +412,12 @@ } }, {data: "submitter"}, + {% if helpdesk_settings.HELPDESK_ENABLE_TIME_SPENT_ON_TICKET %} {data: "time_spent", "visible": false}, + {% endif %} + {% if helpdesk_settings.HELPDESK_KB_ENABLED %} {data: "kbitem"}, + {% endif %} ] }); diff --git a/helpdesk/urls.py b/helpdesk/urls.py index fc185cc9..711ffa00 100644 --- a/helpdesk/urls.py +++ b/helpdesk/urls.py @@ -108,14 +108,6 @@ urlpatterns = [ staff.ticket_cc_del, name='ticket_cc_del'), - url(r'^tickets/(?P[0-9]+)/dependency/add/$', - staff.ticket_dependency_add, - name='ticket_dependency_add'), - - url(r'^tickets/(?P[0-9]+)/dependency/delete/(?P[0-9]+)/$', - staff.ticket_dependency_del, - name='ticket_dependency_del'), - url(r'^tickets/(?P[0-9]+)/attachment_delete/(?P[0-9]+)/$', staff.attachment_del, name='attachment_del'), @@ -170,6 +162,17 @@ urlpatterns = [ ] +if helpdesk_settings.HELPDESK_ENABLE_DEPENDENCIES_ON_TICKET: + urlpatterns += [ + url(r'^tickets/(?P[0-9]+)/dependency/add/$', + staff.ticket_dependency_add, + name='ticket_dependency_add'), + + url(r'^tickets/(?P[0-9]+)/dependency/delete/(?P[0-9]+)/$', + staff.ticket_dependency_del, + name='ticket_dependency_del'), + ] + urlpatterns += [ url(r'^$', protect_view(public.Homepage.as_view()),