Fix when btn-modal retrn 302 and not redirected

devapp/views.py

@@ -22,12 +22,11 @@ from guardian.shortcuts import get_objects_for_user
 from chatbot.telebot import send_notify
 from chatbot.models import ChatException
 from jsonview.decorators import json_view
-from djing.global_base_views import HashAuthView, AllowedSubnetMixin, OrderingMixin
+from djing import global_base_views
 from .models import Device, Port, DeviceDBException, DeviceMonitoringException
 from .forms import DeviceForm, PortForm
 from mydefs import safe_int
 
-
 PAGINATION_ITEMS_PER_PAGE = getattr(settings, 'PAGINATION_ITEMS_PER_PAGE', 10)
 
 
@@ -37,7 +36,7 @@ class BaseDeviceListView(ListView):
 
 
 @method_decorator([login_required, only_admins], name='dispatch')
-class DevicesListView(BaseDeviceListView, OrderingMixin):
+class DevicesListView(BaseDeviceListView, global_base_views.OrderingMixin):
     context_object_name = 'devices'
     template_name = 'devapp/devices.html'
 
@@ -64,7 +63,7 @@ class DevicesListView(BaseDeviceListView, OrderingMixin):
 
 
 @method_decorator([login_required, only_admins], name='dispatch')
-class DevicesWithoutGroupsListView(BaseDeviceListView, OrderingMixin):
+class DevicesWithoutGroupsListView(BaseDeviceListView, global_base_views.OrderingMixin):
     context_object_name = 'devices'
     template_name = 'devapp/devices_null_group.html'
     queryset = Device.objects.filter(user_group=None).only('comment', 'devtype', 'user_group', 'pk', 'ip_address')
@@ -181,7 +180,7 @@ def manage_ports(request, device_id):
 
 
 @method_decorator([login_required, only_admins], name='dispatch')
-class ShowSubscriberOnPort(DetailView):
+class ShowSubscriberOnPort(global_base_views.RedirectWhenErrorMixin, DetailView):
     template_name = 'devapp/manage_ports/modal_show_subscriber_on_port.html'
     http_method_names = ['get']
 
@@ -192,6 +191,14 @@ class ShowSubscriberOnPort(DetailView):
             obj = Abon.objects.get(device_id=dev_id, dev_port_id=port_id)
         except Abon.DoesNotExist:
             raise Http404(gettext('Subscribers on port does not exist'))
+        except Abon.MultipleObjectsReturned:
+            errmsg = gettext('More than one subscriber on device port')
+            # messages.error(self.request, errmsg)
+            raise global_base_views.RedirectWhenError(
+                resolve_url('devapp:fix_port_conflict', group_id=self.kwargs.get('group_id'), device_id=dev_id,
+                            port_id=port_id),
+                errmsg
+            )
         return obj
 
 
@@ -468,8 +475,8 @@ def fix_onu(request):
         if parent is not None:
             manobj = parent.get_manager_object()
             ports = manobj.get_list_keyval('.1.3.6.1.4.1.3320.101.10.1.1.3')
-            text = '<span class="glyphicon glyphicon-ok"></span> <span class="hidden-xs">%s</span>' %\
-                    (_('Device with mac address %(mac)s does not exist') % {'mac': mac})
+            text = '<span class="glyphicon glyphicon-ok"></span> <span class="hidden-xs">%s</span>' % \
+                   (_('Device with mac address %(mac)s does not exist') % {'mac': mac})
             for srcmac, snmpnum in ports:
                 real_mac = ':'.join(['%x' % ord(i) for i in srcmac])
                 if mac == real_mac:
@@ -502,7 +509,7 @@ def fix_port_conflict(request, group_id, device_id, port_id):
     })
 
 
-class OnDevDown(AllowedSubnetMixin, HashAuthView):
+class OnDevDown(global_base_views.AllowedSubnetMixin, global_base_views.HashAuthView):
     #
     # Api view for monitoring devices
     #

djing/global_base_views.py

@@ -1,6 +1,7 @@
 from hashlib import sha256
+from json import dumps
 from django.views.generic.base import View
-from django.http.response import HttpResponseForbidden, Http404, HttpResponseRedirect
+from django.http.response import HttpResponseForbidden, Http404, HttpResponseRedirect, HttpResponse
 from django.utils.translation import gettext_lazy as _
 from django.conf import settings
 from django.views.generic import ListView
@@ -102,7 +103,22 @@ class OrderingMixin(object):
             return "%s%s" % (dfx, order_by)
 
 
-class BaseListWithFiltering(ListView):
+class RedirectWhenErrorMixin(object):
+
+    def get(self, request, *args, **kwargs):
+        try:
+            return super(RedirectWhenErrorMixin, self).get(request, *args, **kwargs)
+        except RedirectWhenError as e:
+            if request.is_ajax():
+                return HttpResponse(dumps({
+                    'url': e.url,
+                    'text': e.message or ''
+                }))
+            else:
+                return HttpResponseRedirect(e.url)
+
+
+class BaseListWithFiltering(RedirectWhenErrorMixin, ListView):
     """
     When queryset contains filter and pagination than data may be missing,
     and original code is raising 404 error. We want to redirect without pagination.
@@ -135,9 +151,3 @@ class BaseListWithFiltering(ListView):
                 'page_number': page_number,
                 'message': str(e)
             })
-
-    def get(self, request, *args, **kwargs):
-        try:
-            return super(BaseListWithFiltering, self).get(request, *args, **kwargs)
-        except RedirectWhenError as e:
-            return HttpResponseRedirect(e.url)

migrate_to_0.2.py

@@ -50,7 +50,7 @@ def get_fixture_from_unchanget_model(model_name: str, model_class):
     return res
 
 
-def dump_abonapp():
+def dump_groups():
     from abonapp import models
     print('group_app.group')
     res = [{
@@ -60,16 +60,44 @@ def dump_abonapp():
             'title': abon_group.title
         }
     } for abon_group in models.AbonGroup.objects.all()]
+    return res
+
 
+def dump_abonapp():
+    from abonapp import models
     # res += get_fixture_from_unchanget_model('abonapp.abonlog', models.AbonLog)
 
-    res += get_fixture_from_unchanget_model('abonapp.abontariff', models.AbonTariff)
+    res = get_fixture_from_unchanget_model('abonapp.abontariff', models.AbonTariff)
 
     res += get_fixture_from_unchanget_model('abonapp.abonstreet', models.AbonStreet)
 
     res += get_fixture_from_unchanget_model('abonapp.extrafieldsmodel', models.ExtraFieldsModel)
 
-    res += get_fixture_from_unchanget_model('abonapp.abon', models.Abon)
+    res += [{
+        'model': 'abonapp.abon',
+        'pk': abon.pk,
+        'fields': {
+            'current_tariff': abon.current_tariff.pk if abon.current_tariff else None,
+            'group': abon.group.pk if abon.group else None,
+            'ballance': abon.ballance,
+            'ip_address': abon.ip_address,
+            'description': abon.description,
+            'street': abon.street.pk if abon.street else None,
+            'house': abon.house,
+            'extra_fields': [a.pk for a in abon.extra_fields.all()],
+            'device': abon.device.pk if abon.device else None,
+            'dev_port': abon.dev_port if abon.dev_port else None,
+            'is_dynamic_ip': abon.is_dynamic_ip,
+            'markers': abon.markers,
+
+            'username': abon.username,
+            'fio': abon.fio,
+            'birth_day': abon.birth_day,
+            'is_active': abon.is_active,
+            'is_admin': abon.is_admin,
+            'telephone': abon.telephone
+        }
+    } for abon in models.Abon.objects.filter(is_admin=False)]
 
     res += get_fixture_from_unchanget_model('abonapp.passportinfo', models.PassportInfo)
 
@@ -106,8 +134,8 @@ def dump_devs():
             'mac_addr': dv.mac_addr,
             'devtype': dv.devtype,
             'man_passw': dv.man_passw,
-            'group': dv.user_group.pk if dv.user_group else 0,
-            'parent_dev': dv.parent_dev.pk if dv.parent_dev else 0
+            'group': dv.user_group.pk if dv.user_group else None,
+            'parent_dev': dv.parent_dev.pk if dv.parent_dev else None
         }
     } for dv in models.Device.objects.all()]
 
@@ -135,7 +163,7 @@ def dump_accounts():
             'is_active': up.is_active,
             'is_admin': up.is_admin,
             'telephone': up.telephone,
-            'avatar': up.avatar.pk if up.avatar else 0,
+            'avatar': up.avatar.pk if up.avatar else None,
             'email': up.email,
             'responsibility_groups': get_responsibility_groups(up)
         }
@@ -146,7 +174,15 @@ def dump_accounts():
 
 def dump_photos():
     from photo_app.models import Photo
-    res = get_fixture_from_unchanget_model('photo_app.photo', Photo)
+    res = [{
+        'model': 'photo_app.photo',
+        'pk': p.pk,
+        'fields': {
+            'image': "%s" % p.image,
+            'wdth': p.wdth,
+            'heigt': p.heigt
+        }
+    } for p in Photo.objects.all()]
     return res
 
 
@@ -198,16 +234,17 @@ def make_migration():
             dump(func(), f, default=my_date_converter, ensure_ascii=False)
 
     django.setup()
-    appdump(['fixtures', 'tariff_app', 'tariffs_fixture.json'], dump_tariffs)
-    appdump(['fixtures', 'photo_app', 'photos_fixture.json'], dump_photos)
-    appdump(['fixtures', 'devapp', 'devs_fixture.json'], dump_devs)
-    appdump(['fixtures', 'abonapp', 'abon_fixture.json'], dump_abonapp)
+    #appdump(['fixtures', 'group_app', 'groups_fixture.json'], dump_groups)
+    #appdump(['fixtures', 'tariff_app', 'tariffs_fixture.json'], dump_tariffs)
+    #appdump(['fixtures', 'photo_app', 'photos_fixture.json'], dump_photos)
+    #appdump(['fixtures', 'devapp', 'devs_fixture.json'], dump_devs)
     appdump(['fixtures', 'accounts_app', 'accounts_fixture.json'], dump_accounts)
+    appdump(['fixtures', 'abonapp', 'abon_fixture.json'], dump_abonapp)
 
-    appdump(['fixtures', 'chatbot', 'chatbot_fixture.json'], dump_chatbot)
-    appdump(['fixtures', 'mapapp', 'map_fixture.json'], dump_map)
-    appdump(['fixtures', 'msg_app', 'mesages_fixture.json'], dump_messages)
-    appdump(['fixtures', 'taskapp', 'task_fixture.json'], dump_task_app)
+    #appdump(['fixtures', 'chatbot', 'chatbot_fixture.json'], dump_chatbot)
+    #appdump(['fixtures', 'mapapp', 'map_fixture.json'], dump_map)
+    #appdump(['fixtures', 'msg_app', 'mesages_fixture.json'], dump_messages)
+    #appdump(['fixtures', 'taskapp', 'task_fixture.json'], dump_task_app)
 
 
 def move_to_fixtures_dirs():

static/js/my.js

@@ -214,7 +214,7 @@ $(document).ajaxError(function (ev, jqXHR, ajaxSettings, thrownError) {
         }
 
         if(settings.news_url){
-            // прверяем новости раз в минуту
+            // once per minute check news
             var tiid = setInterval(check_news, settings.check_interval*1000);
 
             //Notification.requestPermission(on_ask_perm);
@@ -266,13 +266,20 @@ $(document).ready(function () {
 	});
 
     $('.btn-modal').on('click', function(){
-        $.get(this.href, function(r){
-            show_ModalMyContent(r);
+        $.get(this.href, function(response){
+        console.log(response);
+            try{
+                var r = $.parseJSON(response);
+                console.log(r.text);
+                window.location.replace(r.url);
+            }catch (e){
+                show_ModalMyContent(response);
+            }
         });
         return false;
     });
 
-	// кнопка посылающая комманду и возвращающая результат выполнения
+	// button that send command and return response of that
 	$('.btn-cmd').on('click', function(){
 		var cmd_param = $(this).attr('data-param');
 		var self = $(this);

systemd_units/webdav_backup.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
-import webdav.client as wc
-from webdav.client import WebDavException
 from sys import argv
+from datetime import datetime, timedelta
+import webdav.client as wc
 
 
 options = {
@@ -10,11 +10,26 @@ options = {
     'webdav_password': "YANDEX PASSWORD"
 }
 
+
+def remove_old_files(border_time : datetime, client):
+    # files that older than border_time will be removed
+    for file in client.list('ISBackups'):
+        fdate = datetime.strptime(file, 'djing%Y-%m-%d_%H.%M.%S.sql.gz')
+        if fdate < border_time:
+            del_fname = 'ISBackups/%' % file
+            client.clean( del_fname )
+            print("rm %s" % del_fname)
+
+
 if __name__ == '__main__':
     reqfile = argv[1]
     try:
         client = wc.Client(options)
-        client.upload_sync(remote_path="ISBackups/%s" % reqfile, local_path="/var/backups/%s" % reqfile)
-    except WebDavException as we:
+        if reqfile == 'rotate':
+            border_time = datetime.now() - timedelta(month=3)
+            remove_old_files(border_time, client)
+        else:
+            client.upload_sync(remote_path="ISBackups/%s" % reqfile, local_path="/var/backups/%s" % reqfile)
+    except wc.WebDavException as we:
         print(we, type(we))