From 6b2390eb734aaff8bdb94e80794372259931c432 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9?= Date: Sun, 2 Apr 2017 11:31:34 +0300 Subject: [PATCH 1/5] Update README.md --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index c2894f1..277f581 100644 --- a/README.md +++ b/README.md @@ -8,3 +8,13 @@ Привязывать на карте к точкам топологии устройства Есть привязка монтажника к группам абонентов Есть менеджер задач на абонентов. Это оператор может выбрать абонента и описать проблему. Система отправит оповещение через telegram ответственному за групу указанного абонента монтажнику с текстом проблемы, адресом и телефоном абонента. + +## Установка(не завершил описание): +На ArchLinux нужые пакеты я устанавливаю так: +``` +# pacman -Sy mariadb-clients python3 python-pip nginx uwsgi +``` +Дальше ставим всё для python через pip: +``` +# pip install git+https://github.com/nerosketch/djing.git +``` From 55554e13a4467a3bec5dbd7354f3f2d08b674e55 Mon Sep 17 00:00:00 2001 From: http Date: Fri, 14 Apr 2017 14:23:29 +0300 Subject: [PATCH 2/5] =?UTF-8?q?=D0=BF=D0=BE=D0=BC=D0=B5=D0=BD=D1=8F=D0=BB?= =?UTF-8?q?=20=D0=BF=D1=83=D1=82=D1=8C=20=D0=BA=20=D0=BA=D0=B0=D1=80=D1=82?= =?UTF-8?q?=D0=B8=D0=BD=D0=BA=D0=B0=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- taskapp/migrations/0013_auto_20170413_1944.py | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 taskapp/migrations/0013_auto_20170413_1944.py diff --git a/taskapp/migrations/0013_auto_20170413_1944.py b/taskapp/migrations/0013_auto_20170413_1944.py new file mode 100644 index 0000000..6feeb90 --- /dev/null +++ b/taskapp/migrations/0013_auto_20170413_1944.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9 on 2017-04-13 16:44 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('taskapp', '0012_auto_20170407_0124'), + ] + + operations = [ + migrations.AlterField( + model_name='task', + name='attachment', + field=models.ImageField(blank=True, null=True, upload_to='task_attachments/%Y.%m.%d'), + ), + ] From dd8a4d823ce6f7fec63a48f85548a8a05857bee5 Mon Sep 17 00:00:00 2001 From: http Date: Fri, 14 Apr 2017 14:23:53 +0300 Subject: [PATCH 3/5] =?UTF-8?q?=D0=BF=D0=BE=D0=BC=D0=B5=D0=BD=D1=8F=D0=BB?= =?UTF-8?q?=20=D0=BF=D1=83=D1=82=D1=8C=20=D0=BA=20=D0=BA=D0=B0=D1=80=D1=82?= =?UTF-8?q?=D0=B8=D0=BD=D0=BA=D0=B0=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- taskapp/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taskapp/models.py b/taskapp/models.py index e738742..649ad70 100644 --- a/taskapp/models.py +++ b/taskapp/models.py @@ -67,7 +67,7 @@ class Task(models.Model): out_date = models.DateField(null=True, blank=True, default=_delta_add_days) time_of_create = models.DateTimeField(auto_now_add=True) state = models.CharField(max_length=1, choices=TASK_STATES, default=TASK_STATES[0][0]) - attachment = models.ImageField(upload_to='media/task_attachments/%Y.%m.%d', blank=True, null=True) + attachment = models.ImageField(upload_to='task_attachments/%Y.%m.%d', blank=True, null=True) mode = models.CharField(max_length=2, choices=TASK_TYPES, default=TASK_TYPES[0][0]) abon = models.ForeignKey(Abon, on_delete=models.SET_NULL, null=True, blank=True, related_name='+') From 8f201cf137eeb0a821f2fe0df04986d91a4d0f71 Mon Sep 17 00:00:00 2001 From: http Date: Fri, 14 Apr 2017 14:24:43 +0300 Subject: [PATCH 4/5] =?UTF-8?q?FIXBUG:=20=D0=BF=D0=BE=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=B8=D0=BB=20=D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20opt82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- abonapp/views.py | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/abonapp/views.py b/abonapp/views.py index 1573f7d..69c3dcf 100644 --- a/abonapp/views.py +++ b/abonapp/views.py @@ -309,27 +309,30 @@ def opt82(request, gid, uid): try: abon = models.Abon.objects.get(pk=uid) if request.method == 'POST': - if abon.opt82 is None: + try: + opt82_instance = models.Opt82.objects.get( + mac=request.POST.get('mac'), + port=request.POST.get('port') + ) + except models.Opt82.DoesNotExist: frm = forms.Opt82Form(request.POST) - else: - frm = forms.Opt82Form(request.POST, instance=abon.opt82) - if frm.is_valid(): - abon.opt82 = frm.save() - abon.save(update_fields=['opt82']) - else: - messages.error(request, _('fix form errors')) + if frm.is_valid(): + opt82_instance = frm.save() + else: + messages.error(request, _('fix form errors')) + return redirect('abonapp:abon_home', gid=gid, uid=uid) + + abon.opt82 = opt82_instance else: act = request.GET.get('act') if act is not None and act == 'release': if abon.opt82 is not None: abon.opt82.delete() abon.opt82 = None - abon.save(update_fields=['opt82']) + abon.save(update_fields=['opt82']) except models.Abon.DoesNotExist: messages.error(request, _('User does not exist')) - except models.Opt82.DoesNotExist: - messages.error(request, _('')) return redirect('abonapp:abon_home', gid=gid, uid=uid) From 4675a77274e0e664269018dacf46ed1eed91f920 Mon Sep 17 00:00:00 2001 From: http Date: Fri, 14 Apr 2017 14:25:35 +0300 Subject: [PATCH 5/5] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20=D1=86=D0=B5=D0=BD=20=D0=BD?= =?UTF-8?q?=D0=B0=20=D1=83=D1=81=D0=BB=D1=83=D0=B3=D0=B8=20=D0=B2=20=D1=84?= =?UTF-8?q?=D0=BE=D1=80=D0=BC=D0=B5=20=D0=BF=D0=BE=D0=BA=D1=83=D0=BF=D0=BA?= =?UTF-8?q?=D0=B8=20=D1=83=D1=81=D0=BB=D1=83=D0=B3=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- abonapp/templates/abonapp/buy_tariff.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/abonapp/templates/abonapp/buy_tariff.html b/abonapp/templates/abonapp/buy_tariff.html index 430c3da..8e84d97 100644 --- a/abonapp/templates/abonapp/buy_tariff.html +++ b/abonapp/templates/abonapp/buy_tariff.html @@ -28,7 +28,7 @@ @@ -44,4 +44,4 @@ -{% endblock %} \ No newline at end of file +{% endblock %}