Merge branch 'devel' of http://github.com/nerosketch/djing into devel

abonapp/templates/abonapp/editAbon.html

@@ -148,7 +148,8 @@
                             <div class="col-sm-8 btn-group btn-group-sm">
                                 {% if device %}
                                     <a href="{% url 'devapp:view' group.pk device.pk %}" target="_blank" class="btn btn-sm btn-default" title="{% trans 'Mac Address' %}: {{ device.mac_addr|default:_('Not assigned') }}">
-                                        <span class="glyphicon glyphicon-hdd"></span> <span class="hidden-md">{{ device.comment|truncatechars:11 }} {{ device.ip_address|default:'' }}</span>
+                                        <span class="glyphicon glyphicon-hdd"></span>
+                                        <span class="hidden-md">{{ device.comment|truncatechars:11 }} {{ device.ip_address|default:'' }}</span>
                                     </a>
                                     <a href="{% url 'abonapp:clear_dev' group.pk abon.username %}" class="btn btn-sm btn-danger">
 					                    <span class="glyphicon glyphicon-remove-circle"></span> <span class="hidden-xs hidden-lg">{% trans 'Remove clutch' %}</span>

docs/install.md

@@ -12,10 +12,10 @@
 
 Затем установим зависимости
 ```
-# dnf -y install python3 python3-devel python3-pip python3-pillow mariadb mariadb-devel uwsgi nginx uwsgi-plugin-python3 net-snmp net-snmp-libs net-snmp-utils net-snmp-devel net-snmp-python git redhat-rpm-config
+# dnf -y install python3 python3-devel python3-pip python3-pillow mariadb mariadb-devel uwsgi nginx uwsgi-plugin-python3 net-snmp net-snmp-libs net-snmp-utils net-snmp-devel net-snmp-python git redhat-rpm-config curl-devel
 ```
 
-Лучше чтоб версия python по умолчанию была третья:
+Необходимо чтоб версия python по умолчанию была третья:
 ```
 # ln -sf python3 /usr/bin/python
 ```
@@ -27,6 +27,7 @@
 # cd /var/www
 # pip3 install --upgrade pip
 # git clone https://github.com/nerosketch/djing.git
+# export PYCURL_SSL_LIBRARY=openssl
 # pip3 install -r djing/requirements.txt
 ```
 

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('uid')
+            if uname:
+                self.selected_abon = Abon.objects.get(username=uname)
             return
         else:
             task = get_object_or_404(Task, pk=task_id)