Skip to content

Commit

Permalink
add use of staticfiles and init custom Report add_view
Browse files Browse the repository at this point in the history
  • Loading branch information
simodalla committed Jul 9, 2014
1 parent 8929e42 commit 48b296c
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 4 deletions.
21 changes: 21 additions & 0 deletions helpdesk/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from django.contrib.admin.templatetags.admin_urls import admin_urlname
from django.contrib.contenttypes.generic import GenericTabularInline
from django.core.urlresolvers import reverse
from django.shortcuts import redirect
from django.utils.translation import ugettext_lazy as _, ugettext

from mezzanine.core.admin import TabularDynamicInlineAdmin
Expand Down Expand Up @@ -313,6 +314,26 @@ class ReportAdmin(admin.ModelAdmin):
'action_on_ticket', 'sender', 'recipient']
search_fields = ['ticket__pk', 'ticket__content', 'content']

@staticmethod
def _check_access(request):
url_to_redirect = reverse(admin_urlname(Ticket._meta, 'changelist'))
ticket_id = request.GET.get('ticket', None)
error = None
if not ticket_id:
error = "ERROR MANCANZA TICKET ID"
elif Ticket.objects.filter(id=ticket_id).count() == 0:
error = "ERROR TICKET ID NO TICKET MATCH"
if error:
messages.error(request, error)
return redirect(url_to_redirect)

def add_view(self, request, form_url='', extra_context=None):
return (
ReportAdmin._check_access(request) or
super(ReportAdmin, self).add_view( request, form_url=form_url,
extra_context=extra_context)
)


admin.site.register(Category, CategoryAdmin)
admin.site.register(Tipology, TipologyAdmin)
Expand Down
4 changes: 4 additions & 0 deletions helpdesk/static/helpdesk/js/report.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
$(document).ready(function () {
$("#id_ticket").attr("disabled", "disabled");
$("#add_id_ticket").remove();
});
4 changes: 3 additions & 1 deletion helpdesk/templates/admin/helpdesk/change_form.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
{% overextends "admin/change_form.html" %}

{% load staticfiles %}

{% block extrahead %}
{{ block.super }}
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.js" type="text/javascript"></script>
{% include 'autocomplete_light/static.html' %}
<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet">
<link rel="stylesheet" href="//code.jquery.com/ui/1.11.0/themes/smoothness/jquery-ui.css">
<script src="//code.jquery.com/ui/1.11.0/jquery-ui.js" type="text/javascript"></script>
<script src="/static/helpdesk/js/helpdesk.js" type="text/javascript"></script>
<script src="{% static "helpdesk/js/helpdesk.js" %}" type="text/javascript"></script>
{% endblock %}
3 changes: 2 additions & 1 deletion helpdesk/templates/admin/helpdesk/report/change_form.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{% overextends "admin/helpdesk/change_form.html" %}

{% load helpdesk_tags i18n %}
{% load helpdesk_tags i18n staticfiles %}

{% block extrahead %}
{{ block.super }}
<script src="{% static "helpdesk/js/report.js" %}" type="text/javascript"></script>
{% endblock %}

{% block after_field_sets %}Ciao{% endblock %}
4 changes: 2 additions & 2 deletions helpdesk/templates/admin/helpdesk/ticket/change_form.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{% overextends "admin/helpdesk/change_form.html" %}

{% load helpdesk_tags i18n %}
{% load helpdesk_tags i18n staticfiles %}

{% block extrahead %}
{{ block.super }}
<script src="/static/helpdesk/js/ticket.js" type="text/javascript"></script>
<script src="{% static "helpdesk/js/ticket.js" %}" type="text/javascript"></script>
{% endblock %}

{% block after_field_sets %}
Expand Down

0 comments on commit 48b296c

Please sign in to comment.