diff --git a/abonapp/views.py b/abonapp/views.py index 0e2c356..48a7455 100644 --- a/abonapp/views.py +++ b/abonapp/views.py @@ -753,18 +753,22 @@ def save_user_dev_port(request, gid, uid): if abon.device is not None: try: other_abon = models.Abon.objects.get(device=abon.device, dev_port=port) - user_url = resolve_url('abonapp:abon_home', other_abon.group.id, other_abon.id) - messages.error(request, _("%(user_name)s already pinned to this port on this device") % { - 'user_url': user_url, - 'user_name': other_abon.get_full_name() - }) - return redirect('abonapp:abon_home', gid, uid) + if other_abon != abon: + user_url = resolve_url('abonapp:abon_home', other_abon.group.id, other_abon.id) + messages.error(request, _("%(user_name)s already pinned to this port on this device") % { + 'user_url': user_url, + 'user_name': other_abon.get_full_name() + }) + return redirect('abonapp:abon_home', gid, uid) except models.Abon.DoesNotExist: pass abon.dev_port = port if abon.is_dynamic_ip != is_dynamic_ip: - abon.is_dynamic_ip = is_dynamic_ip + if is_dynamic_ip == 'on': + abon.is_dynamic_ip = True + else: + abon.is_dynamic_ip = False abon.save(update_fields=['dev_port', 'is_dynamic_ip']) else: abon.save(update_fields=['dev_port']) diff --git a/accounts_app/models.py b/accounts_app/models.py index ca53866..985f320 100644 --- a/accounts_app/models.py +++ b/accounts_app/models.py @@ -3,7 +3,7 @@ import os from django.db import models from django.contrib.auth.models import BaseUserManager, AbstractBaseUser, PermissionsMixin from django.core.validators import RegexValidator -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext_lazy as _ from django.conf import settings from photo_app.models import Photo diff --git a/agent/netflow/netflow_handler.sh b/agent/netflow/netflow_handler.sh deleted file mode 100755 index c5c873e..0000000 --- a/agent/netflow/netflow_handler.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash - -FNAME="$1" - -if [[ -z "$FNAME" ]]; then - echo "Нужно имя файла дампа netflow" - exit 1 -fi - -CUR_DIR=`dirname $0` - -DUMP_FILE="/tmp/djing_flow/$FNAME" -PATH=/usr/local/sbin:/usr/local/bin:/usr/bin -TMP_DUMP=/tmp/djing_flow/djing_flow_dump.tmp - -cd $CUR_DIR -mkdir -p /tmp/djing_flow -mv $DUMP_FILE $TMP_DUMP - -./djing_flow < $TMP_DUMP | /usr/bin/mysql -uUSER -h -p --password= - -rm $TMP_DUMP diff --git a/devapp/views.py b/devapp/views.py index 201fbc2..17760c5 100644 --- a/devapp/views.py +++ b/devapp/views.py @@ -71,7 +71,7 @@ def devices_null_group(request): def devdel(request, device_id): try: dev = Device.objects.get(pk=device_id) - back_url = resolve_url('devapp:devs', grp=dev.user_group.pk if dev.user_group else 0) + back_url = resolve_url('devapp:devs', group_id=dev.user_group.pk if dev.user_group else 0) dev.delete() return res_success(request, back_url) except Device.DoesNotExist: @@ -162,7 +162,7 @@ def manage_ports(request, device_id): except Device.DoesNotExist: messages.error(request, _('Device does not exist')) - return redirect('devapp:view', dev.user_group.pk if dev.user_group else 0, did=device_id) + return redirect('devapp:group_list') except DeviceDBException as e: messages.error(request, e) return render(request, 'devapp/manage_ports/list.html', { @@ -273,7 +273,7 @@ def edit_single_port(request, group_id, device_id, port_id): messages.success(request, _('Port successfully saved')) else: messages.error(request, _('Form is invalid, check fields and try again')) - return redirect('devapp:manage_ports', group_id, port_id) + return redirect('devapp:manage_ports', group_id, device_id) frm = PortForm(instance=port) return render_to_text('devapp/manage_ports/modal_add_edit_port.html', { diff --git a/static/css/custom.css b/static/css/custom.css index 0fe073e..ade7ac7 100644 --- a/static/css/custom.css +++ b/static/css/custom.css @@ -242,9 +242,8 @@ button[data-toggle=offcanvas]{ * Цвет заливки графика */ .ct-series-a .ct-area { - fill: black; - opacity: 0.3; - fill-opacity: 0.3; + fill: #367cb8; + fill-opacity: 0.4; } diff --git a/taskapp/templates/taskapp/tasklist.html b/taskapp/templates/taskapp/tasklist.html index c206fb9..3723158 100644 --- a/taskapp/templates/taskapp/tasklist.html +++ b/taskapp/templates/taskapp/tasklist.html @@ -44,7 +44,7 @@ {% endif %} {{ task.get_mode_display }} - {{ task.descr }} + {{ task.descr|default:'' }} {% if task.author %} {{ task.author.username }}