Browse Source

HOTFIX: когда удаляли option82 то удалялся и абонент

devel
http 9 years ago
parent
commit
f5f24d3358
  1. 21
      abonapp/migrations/0015_auto_20170410_1737.py
  2. 4
      abonapp/models.py
  3. 3
      abonapp/views.py

21
abonapp/migrations/0015_auto_20170410_1737.py

@ -0,0 +1,21 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9 on 2017-04-10 14:37
from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('abonapp', '0014_auto_20170330_1452'),
]
operations = [
migrations.AlterField(
model_name='abon',
name='opt82',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='abonapp.Opt82'),
),
]

4
abonapp/models.py

@ -209,7 +209,7 @@ class Abon(UserProfile):
street = models.ForeignKey(AbonStreet, on_delete=models.SET_NULL, null=True, blank=True)
house = models.CharField(max_length=12, null=True, blank=True)
extra_fields = models.ManyToManyField(ExtraFieldsModel, blank=True)
opt82 = models.ForeignKey(Opt82, null=True, blank=True)
opt82 = models.ForeignKey(Opt82, null=True, blank=True, on_delete=models.SET_NULL)
_act_tar_cache = None
@ -422,6 +422,8 @@ def abon_post_save(sender, instance, **kwargs):
def abon_del_signal(sender, instance, **kwargs):
try:
ab = instance.build_agent_struct()
if ab is None:
return True
# подключаемся к NAS'у
tm = Transmitter()
# нашли абонента, и удаляем его на NAS

3
abonapp/views.py

@ -317,11 +317,10 @@ def opt82(request, gid, uid):
act = request.GET.get('act')
if act is not None and act == 'release':
if abon.opt82 is not None:
#models.Opt82.objects.get(pk=abon.opt82.pk).delete()
abon.opt82.delete()
abon.opt82 = None
abon.save(update_fields=['opt82'])
except models.Abon.DoesNotExist:
messages.error(request, _('User does not exist'))
except models.Opt82.DoesNotExist:

Loading…
Cancel
Save