From d97d0218ff3332bcc84ac7f0cfe53a67a37141e8 Mon Sep 17 00:00:00 2001
From: bashmak <nerosketch@gmail.com>
Date: Sat, 8 Apr 2017 13:52:33 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A7=D1=83=D1=82=D1=8C=20=D0=BB=D0=BE=D0=B3?=
 =?UTF-8?q?=D0=B8=D0=BA=D0=B8=20=D0=B2=20=D0=BF=D0=BE=D0=BB=D1=8F=D1=85=20?=
 =?UTF-8?q?dhcp=20=D0=BD=D0=B0=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=86=D0=B5=20=D0=B0=D0=B1=D0=BE=D0=BD=D0=B5=D0=BD=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 abonapp/templates/abonapp/editAbon.html | 23 ++++++++++++++---------
 abonapp/views.py                        | 24 ++++++++++++++++++------
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/abonapp/templates/abonapp/editAbon.html b/abonapp/templates/abonapp/editAbon.html
index ef6160a..d15fc51 100644
--- a/abonapp/templates/abonapp/editAbon.html
+++ b/abonapp/templates/abonapp/editAbon.html
@@ -35,7 +35,7 @@
                         <div class="form-group-sm">
                             <label for="id_ip" class="col-sm-4 control-label">{% trans 'Ip Address' %}</label>
                             <div class="col-sm-8">
-                                <input type="text" value="{{ ip|default:'' }}" class="form-control" name="ip" placeholder="{% trans 'Not assigned' %}" pattern="^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$"/>
+                                <input type="text" value="{{ ip|default:'' }}" class="form-control" name="ip" placeholder="{% trans 'Not assigned' %}" pattern="^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$"{% if abon.opt82 %} disabled{% endif %}/>
                             </div>
                         </div>
 
@@ -93,11 +93,16 @@
                         <div class="form-group-sm">
                             <div class="col-sm-offset-4 col-sm-8 btn-group btn-group-sm">
                                 <button type="submit" class="btn btn-primary btn-sm">
-                                    <span class="glyphicon glyphicon-save"></span> {% trans 'Save' %}
+                                    <span class="glyphicon glyphicon-floppy-disk"></span> {% trans 'Save' %}
                                 </button>
-                                <a href="#" class="btn btn-default btn-sm" onclick="showPrimary('<h3>Надо ещё придумать чем будем абонентам отправлять оповещения</h3> Ну кроме смс');">
-                                    <span class="glyphicon glyphicon-bullhorn"></span> {% trans 'Send account info to user' %}
-                                </a>
+                                <!--<a href="#" class="btn btn-default btn-sm" onclick="showPrimary('<h3>Надо ещё придумать чем будем абонентам отправлять оповещения</h3> Ну кроме смс');">
+                                    <span class="glyphicon glyphicon-send"></span> {% trans 'Send account info to user' %}
+                                </a>-->
+                                {% if perms.taskapp.add_task %}
+                                    <a href="{% url 'taskapp:add' %}?uid={{ abon.username }}" class="btn btn-sm btn-success" title="{% trans 'Add new task' %}">
+                                        <span class="glyphicon glyphicon-plus"></span> {% trans 'Add new task' %}
+                                    </a>
+                                {% endif %}
                             </div>
                         </div>
 
@@ -130,11 +135,11 @@
                         <div class="form-group-sm">
                             <div class="col-sm-offset-2 col-sm-10 btn-group btn-group-sm">
                                 <button type="submit" class="btn btn-primary btn-sm">
-                                    <span class="glyphicon glyphicon-save"></span> {% trans 'Save' %}
-                                </button>
-                                <button type="reset" class="btn btn-default btn-sm">
-                                    <span class="glyphicon glyphicon-refresh"></span> {% trans 'Reset' %}
+                                    <span class="glyphicon glyphicon-floppy-disk"></span> {% trans 'Save' %}
                                 </button>
+                                <a href="{% url 'abonapp:opt82' abon_group.pk abon.pk %}?act=release" class="btn btn-danger btn-sm" title="{% trans 'Reset option82' %}">
+                                    <span class="glyphicon glyphicon-trash"></span> {% trans 'Delete' %}
+                                </a>
                             </div>
                         </div>
 
diff --git a/abonapp/views.py b/abonapp/views.py
index 4ffc1b9..b0f8582 100644
--- a/abonapp/views.py
+++ b/abonapp/views.py
@@ -244,12 +244,14 @@ def abonhome(request, gid, uid):
                 raise PermissionDenied
             frm = forms.AbonForm(request.POST, instance=abon)
             if frm.is_valid():
-                ip_str = request.POST.get('ip')
-                if ip_str:
-                    ip = IpPoolItem.objects.get(ip=ip_str)
-                    abon.ip_address = ip
-                else:
-                    abon.ip_address = None
+                # если нет option82, т.е. динамический ip то не сохраняем изменения ip
+                if abon.opt82 is None:
+                    ip_str = request.POST.get('ip')
+                    if ip_str:
+                        ip = IpPoolItem.objects.get(ip=ip_str)
+                        abon.ip_address = ip
+                    else:
+                        abon.ip_address = None
                 frm.save()
                 messages.success(request, _('edit abon success msg'))
             else:
@@ -303,9 +305,19 @@ def opt82(request, gid, uid):
                 abon.save(update_fields=['opt82'])
             else:
                 messages.error(request, _('fix form errors'))
+        else:
+            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.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)