From 1d86d4819bddae1d10870c106a547cc738112134 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9?= Date: Wed, 28 Feb 2018 00:55:00 +0600 Subject: [PATCH 1/5] Update install_debian.sh --- install_debian.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install_debian.sh b/install_debian.sh index 2cada99..99ab757 100644 --- a/install_debian.sh +++ b/install_debian.sh @@ -1,3 +1,3 @@ /usr/bin/bash - -apt-get install mariadb-server mariadb-client libmysqlclient-dev python3-dev python3-pip python3-pillow uwsgi nginx uwsgi-plugin-python3 libsnmp-dev git +apt-get install mariadb-server mariadb-client default-libmysqlclient-dev python3-dev python3-pip python3-pil uwsgi nginx uwsgi-plugin-python3 libsnmp-dev git From ec776106a5d445c3c174a1eca3990ce2ee5fd008 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9?= Date: Wed, 28 Feb 2018 01:20:30 +0600 Subject: [PATCH 2/5] Update install_debian.sh --- install_debian.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install_debian.sh b/install_debian.sh index 99ab757..397248e 100644 --- a/install_debian.sh +++ b/install_debian.sh @@ -1,3 +1,3 @@ /usr/bin/bash - -apt-get install mariadb-server mariadb-client default-libmysqlclient-dev python3-dev python3-pip python3-pil uwsgi nginx uwsgi-plugin-python3 libsnmp-dev git +apt-get install mariadb-server mariadb-client default-libmysqlclient-dev python3-dev python3-pip python3-pil uwsgi nginx uwsgi-plugin-python3 libsnmp-dev git gettext From 980689be3628cbb2bdae278128234d64ad3b6c6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9?= Date: Thu, 1 Mar 2018 11:16:32 +0200 Subject: [PATCH 3/5] Update views.md --- docs/views.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/views.md b/docs/views.md index cdf902e..2c3c13e 100644 --- a/docs/views.md +++ b/docs/views.md @@ -33,7 +33,7 @@ class PaysListView(ListView): На примере *devapp/devices.html* можно рассмотреть такую сортировку. Там указан url с параметрами -> {% url 'devapp:devs' group.pk %}?order_by=ip_address&dir={{ dir|default:'down' }} +> \{\% url 'devapp:devs' group.pk \%\}?order_by=ip_address&dir=\{\{ dir|default:'down' \}\} Тут обратная сортировка по полю *ip_address*, со знаком -. То есть эквивалент будет выглядеть примерно так: > Device.objects.all().order_by('-ip_address') From 5def7b81b9a2dc2a2145e2366371838a2d33f028 Mon Sep 17 00:00:00 2001 From: bashmak Date: Thu, 15 Mar 2018 19:26:56 +0300 Subject: [PATCH 4/5] 1 --- migrate_to_0.2.py | 69 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 51 insertions(+), 18 deletions(-) diff --git a/migrate_to_0.2.py b/migrate_to_0.2.py index 594d434..04bc032 100755 --- a/migrate_to_0.2.py +++ b/migrate_to_0.2.py @@ -6,6 +6,13 @@ import shutil from json import dump import django + +''' +Some permissions is not migrates, all admins is superuser +after migrate. +''' + + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "djing.settings") from django.db.models import fields as django_fields @@ -64,7 +71,6 @@ def dump_groups(): 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) @@ -72,6 +78,8 @@ def dump_abonapp(): res += get_fixture_from_unchanget_model('abonapp.extrafieldsmodel', models.ExtraFieldsModel) + # res += get_fixture_from_unchanget_model('abonapp.abonlog', models.AbonLog) + print('abonapp.abon') res += [{ 'model': 'abonapp.abon', @@ -157,7 +165,8 @@ def dump_accounts(): 'is_admin': up.is_admin, 'telephone': up.telephone, 'password': up.password, - 'last_login': up.last_login + 'last_login': up.last_login, + 'is_superuser': up.is_admin } } for up in models.UserProfile.objects.all()] @@ -214,15 +223,38 @@ def dump_task_app(): def dump_auth(): from django.contrib.auth import models - res = get_fixture_from_unchanget_model('auth.group', models.Group) + from django.contrib.contenttypes.models import ContentType + res = get_fixture_from_unchanget_model('contenttypes.contenttype', ContentType) + res += get_fixture_from_unchanget_model('auth.group', models.Group) res += get_fixture_from_unchanget_model('auth.permission', models.Permission) return res def dump_guardian(): from guardian import models - res = get_fixture_from_unchanget_model('guardian.groupobjectpermission', models.GroupObjectPermission) - res += get_fixture_from_unchanget_model('guardian.userobjectpermission', models.UserObjectPermission) + print('guardian.groupobjectpermission') + res = [{ + 'model': 'guardian.groupobjectpermission', + 'pk': gp.pk, + 'fields': { + 'group': gp.group.pk, + 'permission': gp.permission.pk, + 'content_type': gp.content_type.pk, + 'object_pk': str(gp.object_pk), + 'content_object': gp.content_object.pk + } + } for gp in models.GroupObjectPermission.objects.all()] + print('guardian.userobjectpermission') + res += [{ + 'model': 'guardian.userobjectpermission', + 'pk': up.pk, + 'fields': { + 'permission': up.permission.pk, + 'content_type': up.content_type.pk, + 'object_pk': str(up.object_pk), + 'user': up.user.pk + } + } for up in models.UserObjectPermission.objects.all()] return res @@ -252,8 +284,8 @@ def make_migration(): appdump(['fixtures', 'chatbot', 'chatbot_fixture.json'], dump_chatbot) appdump(['fixtures', 'mapapp', 'map_fixture.json'], dump_map) appdump(['fixtures', 'taskapp', 'task_fixture.json'], dump_task_app) - appdump(['fixtures', 'accounts_app', 'auth_fixture.json'], dump_auth) - appdump(['fixtures', 'accounts_app', 'guardian_fixture.json'], dump_guardian) + # appdump(['fixtures', 'accounts_app', 'auth_fixture.json'], dump_auth) + # appdump(['fixtures', 'accounts_app', 'guardian_fixture.json'], dump_guardian) def move_to_fixtures_dirs(): @@ -273,21 +305,22 @@ def move_to_fixtures_dirs(): def apply_fixtures(): from django.core.management import execute_from_command_line from accounts_app.models import UserProfile - from django.contrib.auth import models + #from django.contrib.auth import models UserProfile.objects.filter(username='AnonymousUser').delete() - print('clearing auth.group') - models.Group.objects.all().delete() - print('clearing auth.permission') - models.Permission.objects.all().delete() + #print('clearing auth.group') + #models.Group.objects.all().delete() + #print('clearing auth.permission') + #models.Permission.objects.all().delete() - print('./manage.py loaddata -v2 ...') - execute_from_command_line([sys.argv[0], 'loaddata', '-v', '2', + fixtures_names = [ 'groups_fixture.json', 'tariffs_fixture.json', 'photos_fixture.json', 'devs_fixture.json', 'accounts_fixture.json', 'abon_fixture.json', - 'chatbot_fixture.json', 'map_fixture.json', 'task_fixture.json', - 'auth_fixture.json', 'guardian_fixture.json' - ]) + 'chatbot_fixture.json', 'map_fixture.json', 'task_fixture.json' + ] + # 'auth_fixture.json', 'guardian_fixture.json' + print('./manage.py loaddata ' + ', '.join(fixtures_names)) + execute_from_command_line([sys.argv[0], 'loaddata'] + fixtures_names) if __name__ == '__main__': @@ -299,7 +332,7 @@ if __name__ == '__main__': django.setup() move_to_fixtures_dirs() apply_fixtures() - os.remove('fixtures') + shutil.rmtree('fixtures') elif choice == 'makedump': django.setup() make_migration() From fdb88b0107a1e12e2fc79c8664342bdef80f2870 Mon Sep 17 00:00:00 2001 From: bashmak Date: Mon, 19 Mar 2018 13:45:29 +0300 Subject: [PATCH 5/5] fix bugs --- mapapp/templates/maps/dot.html | 3 ++- mapapp/templates/maps/modal_add_dot.html | 4 ++-- migrate_to_0.2.py | 25 +++++++++++++++++--- taskapp/templates/taskapp/add_edit_task.html | 3 ++- 4 files changed, 28 insertions(+), 7 deletions(-) diff --git a/mapapp/templates/maps/dot.html b/mapapp/templates/maps/dot.html index e163401..90226f3 100644 --- a/mapapp/templates/maps/dot.html +++ b/mapapp/templates/maps/dot.html @@ -1,6 +1,7 @@ {% extends 'base.html' %} {% load i18n %} {% load bootstrap3 %} +{% load globaltags %} {% block main %}
    @@ -20,7 +21,7 @@
    {% csrf_token %} - +

    {% trans 'Map point' %}

    diff --git a/mapapp/templates/maps/modal_add_dot.html b/mapapp/templates/maps/modal_add_dot.html index d8ca96f..33d639a 100644 --- a/mapapp/templates/maps/modal_add_dot.html +++ b/mapapp/templates/maps/modal_add_dot.html @@ -1,6 +1,6 @@ -{% load i18n %}{% load bootstrap3 %} +{% load i18n %}{% load bootstrap3 %}{% load globaltags %} {% csrf_token %} - +

    {% trans 'Add point' %}

    diff --git a/migrate_to_0.2.py b/migrate_to_0.2.py index 04bc032..3393850 100755 --- a/migrate_to_0.2.py +++ b/migrate_to_0.2.py @@ -117,7 +117,22 @@ def dump_abonapp(): def dump_tariffs(): from tariff_app import models - res = get_fixture_from_unchanget_model('tariff_app.tariff', models.Tariff) + from abonapp.models import AbonGroup + print('tariff_app.tariff') + res = [{ + 'model': 'tariff_app.tariff', + 'pk': trf.pk, + 'fields': { + 'title': trf.title, + 'descr': trf.descr, + 'speedIn': trf.speedIn, + 'speedOut': trf.speedOut, + 'amount': trf.amount, + 'calc_type': trf.calc_type, + 'is_admin': trf.is_admin, + 'groups': [ag.pk for ag in AbonGroup.objects.filter(tariffs__in=[trf])] + } + } for trf in models.Tariff.objects.all()] res += get_fixture_from_unchanget_model('tariff_app.periodicpay', models.PeriodicPay) @@ -132,11 +147,15 @@ def dump_devs(): 'pk': dv.pk, 'fields': { 'ip_address': dv.ip_address, - 'mac_addr': dv.mac_addr, + 'mac_addr': str(dv.mac_addr) if dv.mac_addr else None, + 'comment': dv.comment, 'devtype': dv.devtype, 'man_passw': dv.man_passw, 'group': dv.user_group.pk if dv.user_group else None, - 'parent_dev': dv.parent_dev.pk if dv.parent_dev else None + 'parent_dev': dv.parent_dev.pk if dv.parent_dev else None, + 'snmp_item_num': dv.snmp_item_num, + 'status': dv.status, + 'is_noticeable': dv.is_noticeable } } for dv in models.Device.objects.all()] diff --git a/taskapp/templates/taskapp/add_edit_task.html b/taskapp/templates/taskapp/add_edit_task.html index 2f5596a..a72f806 100644 --- a/taskapp/templates/taskapp/add_edit_task.html +++ b/taskapp/templates/taskapp/add_edit_task.html @@ -1,6 +1,7 @@ {% extends request.is_ajax|yesno:'bajax.html,base.html' %} {% load i18n %} {% load bootstrap3 %} +{% load globaltags %} {% block main %}
      @@ -28,7 +29,7 @@ {% else %} {% endif %} - {% csrf_token %} + {% csrf_token %} {% bootstrap_icon 'tag' as ic %} {% bootstrap_field form.descr addon_before=ic %}