From f8cb496020225043020ba7e60704389a8c41e8d5 Mon Sep 17 00:00:00 2001 From: Pol Rodoreda Valeri Date: Mon, 14 May 2018 16:14:40 +0200 Subject: [PATCH] Fix issues 70, 71 & 72 --- .../core/companies/create_edit_company.html | 7 +++- .../core/groups/create_edit_group.html | 19 +++++++---- .../core/priorities/create_edit_priority.html | 23 ++++++++----- .../core/queues/create_edit_queue.html | 10 ++++-- .../core/rights/create_edit_right.html | 22 ++++++------- .../core/states/create_edit_state.html | 33 ++++++++++--------- .../core/tickets/create_edit_ticket.html | 8 ++--- .../core/users/create_edit_user.html | 30 +++++++---------- ticketatorapp/core/urls.py | 13 +++++--- ticketatorapp/core/views/company.py | 10 ++++++ ticketatorapp/core/views/group.py | 10 ++++++ ticketatorapp/core/views/priority.py | 10 ++++++ 12 files changed, 122 insertions(+), 73 deletions(-) diff --git a/ticketatorapp/core/templates/core/companies/create_edit_company.html b/ticketatorapp/core/templates/core/companies/create_edit_company.html index b5ea17ac..682fbe23 100644 --- a/ticketatorapp/core/templates/core/companies/create_edit_company.html +++ b/ticketatorapp/core/templates/core/companies/create_edit_company.html @@ -75,7 +75,12 @@

New company

- + Back + {% if form.instance.id %} + Delete + {% else %} + + {% endif %} diff --git a/ticketatorapp/core/templates/core/groups/create_edit_group.html b/ticketatorapp/core/templates/core/groups/create_edit_group.html index 5ce105a4..19ce9adc 100644 --- a/ticketatorapp/core/templates/core/groups/create_edit_group.html +++ b/ticketatorapp/core/templates/core/groups/create_edit_group.html @@ -24,7 +24,7 @@

New group

- +
{% if vars.debug == True%}
@@ -41,7 +41,7 @@

New group

{% if form.errors %}
{{form.errors}} - +
{% endif %} {%endif%} @@ -57,11 +57,11 @@

New group

{%endif%}

{{form.name.errors}} -
+
- - - + + +
@@ -73,7 +73,12 @@

New group

- + Back + {% if form.instance.id %} + Delete + {% else %} + + {% endif %}
diff --git a/ticketatorapp/core/templates/core/priorities/create_edit_priority.html b/ticketatorapp/core/templates/core/priorities/create_edit_priority.html index d1a53af1..299c0051 100644 --- a/ticketatorapp/core/templates/core/priorities/create_edit_priority.html +++ b/ticketatorapp/core/templates/core/priorities/create_edit_priority.html @@ -24,7 +24,7 @@

New priority
- +
{% if vars.debug == True%}
@@ -41,7 +41,7 @@

New priority {{form.errors}} - +

{% endif %} {%endif%} @@ -58,7 +58,7 @@

New priority

{{form.name.errors}}

- + - +
- - - + + +
@@ -107,7 +107,12 @@

New priority - + Back + {% if form.instance.id %} + Delete + {% else %} + + {% endif %} diff --git a/ticketatorapp/core/templates/core/queues/create_edit_queue.html b/ticketatorapp/core/templates/core/queues/create_edit_queue.html index 5871011f..38aa80ae 100644 --- a/ticketatorapp/core/templates/core/queues/create_edit_queue.html +++ b/ticketatorapp/core/templates/core/queues/create_edit_queue.html @@ -139,9 +139,13 @@

New queue

- {%if form.instance.id%} - Delete - {%endif%} + Back + {% if form.instance.id %} + Delete + {% else %} + + {% endif %} + diff --git a/ticketatorapp/core/templates/core/rights/create_edit_right.html b/ticketatorapp/core/templates/core/rights/create_edit_right.html index 8cb4a5f2..d445441c 100644 --- a/ticketatorapp/core/templates/core/rights/create_edit_right.html +++ b/ticketatorapp/core/templates/core/rights/create_edit_right.html @@ -24,7 +24,7 @@

New rights

- +
{% if vars.debug == True%}
@@ -54,8 +54,8 @@

New rights

{{form.grp_src.errors}}
- - + +
@@ -64,7 +64,7 @@

New rights

{{form.queue_dst.errors}}
- +
@@ -74,7 +74,7 @@

New rights

-
+
@@ -83,12 +83,12 @@

New rights

Delete {{form.can_delete}}
Edit {{form.can_edit}}
Comment {{form.can_comment}}
- +
- - + + @@ -99,11 +99,11 @@

New rights

- Back + Back {% if form.instance.id %} - Delete + Delete {% else %} - + {% endif %}
diff --git a/ticketatorapp/core/templates/core/states/create_edit_state.html b/ticketatorapp/core/templates/core/states/create_edit_state.html index 8ebbfc06..591e5a00 100644 --- a/ticketatorapp/core/templates/core/states/create_edit_state.html +++ b/ticketatorapp/core/templates/core/states/create_edit_state.html @@ -37,7 +37,7 @@

New state

- +
{% if vars.debug == True%}
@@ -54,7 +54,7 @@

New state

{% if form.errors %}
{{form.errors}} - +
{% endif %} {%endif%} @@ -90,22 +90,22 @@

New state

{% if form.instance.color %} {% else %} - + {%endif%} - +

{{form.color.errors}}
- - +
- - + +
@@ -113,11 +113,14 @@

New state

- + - {%if form.instance.id%} - Delete - {%endif%} + Back + {% if form.instance.id %} + Delete + {% else %} + + {% endif %}
diff --git a/ticketatorapp/core/templates/core/tickets/create_edit_ticket.html b/ticketatorapp/core/templates/core/tickets/create_edit_ticket.html index 4181ffff..ad6f7f6f 100644 --- a/ticketatorapp/core/templates/core/tickets/create_edit_ticket.html +++ b/ticketatorapp/core/templates/core/tickets/create_edit_ticket.html @@ -32,13 +32,13 @@

{{form_ticket.instance.subject}}

- +
{% include "core/tickets/delete_modal_ticket.html" %} {% else %} - + {%endif%}
@@ -418,7 +418,7 @@ Edit - Delete + Delete {% endfor %} @@ -468,4 +468,4 @@

{{e.log_user}} {{e.log_date}}

var get_percentage_url = "{% url 'tickets-get-percentage' form_ticket.instance.id %}"; {% endif %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/ticketatorapp/core/templates/core/users/create_edit_user.html b/ticketatorapp/core/templates/core/users/create_edit_user.html index e26ade61..dc33680e 100644 --- a/ticketatorapp/core/templates/core/users/create_edit_user.html +++ b/ticketatorapp/core/templates/core/users/create_edit_user.html @@ -12,23 +12,9 @@
{% if not form.instance.id %}

New User

- - {%else%} + {% else %}

Edit User

-
- - - -
- {% include "core/users/delete_modal_user.html" %} - {%endif%} + {% endif %}
@@ -39,7 +25,7 @@

Edit User

{% endif %} {%endif%} - + {% if form.instance.id %}
{% csrf_token %} {% else %} @@ -238,8 +224,14 @@

Edit User

- - + + Back + {% if form.instance.id %} + Delete + {% include "core/users/delete_modal_user.html" %} + {% else %} + + {% endif %} diff --git a/ticketatorapp/core/urls.py b/ticketatorapp/core/urls.py index 408fe92b..9b010690 100644 --- a/ticketatorapp/core/urls.py +++ b/ticketatorapp/core/urls.py @@ -41,6 +41,7 @@ url(r'^settings/groups/$', vgroup.list_groups, name='group-list'), url(r'^settings/groups/create/$', vgroup.manage_group, name='group-create'), url(r'^settings/groups/(?P\d+)/$', vgroup.manage_group, name='group-edit'), + url(r'^settings/groups/delete/(?P\d+)/$', vgroup.delete_group, name='group-delete'), # Rights url(r'^settings/rights/$', vright.list_rights, name='right-list'), @@ -58,14 +59,18 @@ # Companies url(r'^settings/companies/$', vcompanies.list_companies, name='company-list'), url(r'^settings/companies/create/$', vcompanies.manage_company, name='company-create'), - url(r'^settings/companies/(?P\d+)/$', - vcompanies.manage_company, name='company-edit'), + url(r'^settings/companies/(?P\d+)/$', vcompanies.manage_company, + name='company-edit'), + url(r'^settings/companies/delete/(?P\d+)/$', vcompanies.delete_company, + name='company-delete'), # Priorities url(r'^settings/priorities/$', vpriorities.list_priorities, name='priority-list'), url(r'^settings/priorities/create/$', vpriorities.manage_priority, name='priority-create'), - url(r'^settings/priorities/(?P\d+)/$', - vpriorities.manage_priority, name='priority-edit'), + url(r'^settings/priorities/(?P\d+)/$', vpriorities.manage_priority, + name='priority-edit'), + url(r'^settings/priorities/delete/(?P\d+)/$', vpriorities.delete_priority, + name='priority-delete'), # Queues url(r'^settings/queue/$', vqueues.list_queues, name='queue-list'), diff --git a/ticketatorapp/core/views/company.py b/ticketatorapp/core/views/company.py index 0e012899..80bd0eb8 100644 --- a/ticketatorapp/core/views/company.py +++ b/ticketatorapp/core/views/company.py @@ -36,3 +36,13 @@ def manage_company(request, company_id=None): return render(request, 'core/companies/create_edit_company.html', locals()) else: raise Http404 + + +def delete_company(request, company_id=None): + if request.user.is_superuser: + if company_id: + actual_company = get_object_or_404(Company, pk=company_id) + actual_company.delete() + return redirect('company-list') + else: + return Http404 diff --git a/ticketatorapp/core/views/group.py b/ticketatorapp/core/views/group.py index dbaa5e60..da5f7b6a 100644 --- a/ticketatorapp/core/views/group.py +++ b/ticketatorapp/core/views/group.py @@ -33,3 +33,13 @@ def manage_group(request, group_id=None): return render(request, 'core/groups/create_edit_group.html', locals()) else: raise Http404 + + +def delete_group(request, group_id=None): + if request.user.is_superuser: + if group_id: + actual_group = get_object_or_404(Group, pk=group_id) + actual_group.delete() + return redirect('group-list') + else: + return Http404 diff --git a/ticketatorapp/core/views/priority.py b/ticketatorapp/core/views/priority.py index 70cb7e67..a49074c5 100644 --- a/ticketatorapp/core/views/priority.py +++ b/ticketatorapp/core/views/priority.py @@ -36,3 +36,13 @@ def manage_priority(request, priority_id=None): return render(request, 'core/priorities/create_edit_priority.html', locals()) else: raise Http404 + + +def delete_priority(request, priority_id=None): + if request.user.is_superuser: + if priority_id: + actual_priority = get_object_or_404(Priority, pk=priority_id) + actual_priority.delete() + return redirect('priority-list') + else: + raise Http404