From 20165ee538f0dab480c2b800100dda1dd1b4373b Mon Sep 17 00:00:00 2001
From: bashmak <nerosketch@gmail.com>
Date: Tue, 3 Jul 2018 11:38:52 +0300
Subject: [PATCH] Fix user removing

---
 abonapp/templates/abonapp/editAbon.html | 7 +++----
 abonapp/urls.py                         | 2 +-
 abonapp/views.py                        | 2 +-
 taskapp/views.py                        | 6 +++---
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/abonapp/templates/abonapp/editAbon.html b/abonapp/templates/abonapp/editAbon.html
index ad003ec..f887adc 100644
--- a/abonapp/templates/abonapp/editAbon.html
+++ b/abonapp/templates/abonapp/editAbon.html
@@ -37,8 +37,6 @@
                             {% bootstrap_field form.telephone form_group_class='form-group-sm' addon_after_class='input-group-btn' addon_after=bt %}
                         {% endwith %}
 
-                        {% bootstrap_field form.is_active form_group_class='form-group-sm' %}
-
                         {# Ip address field #}
 {#                        {% trans 'Reset ip' as tx %}#}
 {#                        {% url 'abonapp:reset_ip' group.pk abon.username as url %}#}
@@ -48,6 +46,7 @@
 
                         {% bootstrap_field form.street form_group_class='form-group-sm' %}
                         {% bootstrap_field form.house form_group_class='form-group-sm' %}
+                        {% bootstrap_field form.is_active form_group_class='form-group-sm' %}
                         {% bootstrap_field form.group form_group_class='form-group-sm' %}
 
 
@@ -82,7 +81,7 @@
                                 {% endif %}
 
                                 {% if perms.taskapp.add_task %}
-                                    <a href="{% url 'taskapp:add' %}?uid={{ abon.username }}" class="btn btn-success" title="{% trans 'Add new task' %}">
+                                    <a href="{% url 'taskapp:add' %}?uname={{ abon.username }}" class="btn btn-success" title="{% trans 'Add new task' %}">
 					                    <span class="glyphicon glyphicon-plus"></span>
                                         {% trans 'Add new task' %}
                                     </a>
@@ -221,7 +220,7 @@
                     {% endfor %}
                 </ul>
                 <div class="panel-footer">
-                    <a href="#" class="btn btn-success btn-sm">
+                    <a href="#" class="btn btn-success btn-sm" {{ abon.is_dynamic_ip|yesno:'disabled,' }}>
                         <span class="glyphicon glyphicon-plus"></span>
                         <span class="hidden-xs">{% trans 'Add' %}</span>
                     </a>
diff --git a/abonapp/urls.py b/abonapp/urls.py
index 710d872..cb81aa3 100644
--- a/abonapp/urls.py
+++ b/abonapp/urls.py
@@ -18,7 +18,7 @@ subscriber_patterns = [
     # url(r'^reset_ip/$', views.reset_ip, name='reset_ip'),
     url(r'^unsubscribe_service(?P<abon_tariff_id>\d+)/$', views.unsubscribe_service, name='unsubscribe_service'),
     url(r'^dev/$', views.dev, name='dev'),
-    url(r'^del$', views.DelAbonDeleteView.as_view(), name='del_abon'),
+    url(r'^del/$', views.DelAbonDeleteView.as_view(), name='del_abon'),
     url(r'^clear_dev/$', views.clear_dev, name='clear_dev'),
     url(r'^task_log/$', views.TaskLogListView.as_view(), name='task_log'),
     url(r'^user_dev/$', views.save_user_dev_port, name='save_user_dev_port'),
diff --git a/abonapp/views.py b/abonapp/views.py
index 21008ce..0cd3765 100644
--- a/abonapp/views.py
+++ b/abonapp/views.py
@@ -167,8 +167,8 @@ class DelAbonDeleteView(DeleteView):
         try:
             abon = self.get_object()
             gid = abon.group.id
-            abon.delete()
             abon.sync_with_nas(created=False)
+            abon.delete()
             messages.success(request, _('delete abon success msg'))
             return redirect('abonapp:people_list', gid=gid)
         except NasNetworkError as e:
diff --git a/taskapp/views.py b/taskapp/views.py
index 2816936..96e6c0b 100644
--- a/taskapp/views.py
+++ b/taskapp/views.py
@@ -121,9 +121,9 @@ class TaskUpdateView(UpdateView):
     def get_object(self, queryset=None):
         task_id = safe_int(self.kwargs.get('task_id'))
         if task_id == 0:
-            uid = safe_int(self.request.GET.get('uid'))
-            if uid != 0:
-                self.selected_abon = Abon.objects.get(username=str(uid))
+            uname = self.request.GET.get('uname')
+            if uname:
+                self.selected_abon = Abon.objects.get(username=uname)
             return
         else:
             task = get_object_or_404(Task, pk=task_id)