From 47ee73f2e0eaa1ed139d5c49243ae1a8f4f2b800 Mon Sep 17 00:00:00 2001 From: bashmak Date: Mon, 20 Feb 2017 17:16:26 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=20=D0=BE=D1=82=D0=B4=D0=B5=D0=BB?= =?UTF-8?q?=D1=8C=D0=BD=D1=83=D1=8E=20=D0=B2=D0=BA=D0=BB=D0=B0=D0=B4=D0=BA?= =?UTF-8?q?=D1=83=20=D0=B2=D1=8B=D0=B2=D0=B5=D0=BB=20=D0=BF=D0=B0=D1=81?= =?UTF-8?q?=D0=BF=D0=BE=D1=80=D1=82=D0=BD=D1=8B=D0=B5=20=D0=B4=D0=B0=D0=BD?= =?UTF-8?q?=D0=BD=D1=8B=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- abonapp/templates/abonapp/ext.htm | 7 +++ abonapp/templates/abonapp/passport_view.html | 52 ++++++++++++++++++++ abonapp/views.py | 11 ++++- 3 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 abonapp/templates/abonapp/passport_view.html diff --git a/abonapp/templates/abonapp/ext.htm b/abonapp/templates/abonapp/ext.htm index ce69167..86acafc 100644 --- a/abonapp/templates/abonapp/ext.htm +++ b/abonapp/templates/abonapp/ext.htm @@ -31,6 +31,13 @@ {% trans 'Services' %} + {% if perms.abonapp.can_view_passport %} + {% url 'abonapp:passport_view' abon_group.id abon.id as passport_view_url %} + + {% trans 'Passport information' %} + + {% endif %} + {% if perms.abonapp.can_add_ballance %} {% url 'abonapp:abon_amount' abon_group.id abon.id as abamount %} diff --git a/abonapp/templates/abonapp/passport_view.html b/abonapp/templates/abonapp/passport_view.html new file mode 100644 index 0000000..8ae91a8 --- /dev/null +++ b/abonapp/templates/abonapp/passport_view.html @@ -0,0 +1,52 @@ +{% extends request.is_ajax|yesno:'nullcont.htm,abonapp/ext.htm' %} +{% load i18n %} +{% block content %} + +
+
+
+
+

{% trans 'Passport information' %}

+
+
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+
+{% endblock %} \ No newline at end of file diff --git a/abonapp/views.py b/abonapp/views.py index be9e221..78fc228 100644 --- a/abonapp/views.py +++ b/abonapp/views.py @@ -6,7 +6,7 @@ from django.db.models import Count from django.shortcuts import render, redirect, get_object_or_404, resolve_url from django.contrib.auth.decorators import login_required, permission_required from django.utils import timezone -from django.http import HttpResponse, Http404 +from django.http import HttpResponse from django.contrib import messages from django.utils.translation import ugettext as _ @@ -525,6 +525,15 @@ def task_log(request, gid, uid): }) +@login_required +@mydefs.only_admins +def passport_view(request, gid, uid): + abon = get_object_or_404(models.Abon, id=uid) + return render(request, 'abonapp/passport_view.html', { + 'abon_group': get_object_or_404(models.AbonGroup, id=gid), + 'abon': abon + }) + # API's