Browse Source
Merge branch 'global_group_update' of https://github.com/nerosketch/djing into global_group_update
devel
Merge branch 'global_group_update' of https://github.com/nerosketch/djing into global_group_update
devel
www-data
8 years ago
61 changed files with 896 additions and 332 deletions
-
3abonapp/locale/ru/LC_MESSAGES/django.po
-
8abonapp/models.py
-
3abonapp/pay_systems.py
-
7abonapp/templates/abonapp/log.html
-
12abonapp/templates/abonapp/peoples.html
-
27abonapp/views.py
-
2accounts_app/views.py
-
7agent/netflow/netflow_handler.py
-
2chatbot/models.py
-
169clientsideapp/locale/ru/LC_MESSAGES/django.po
-
1clientsideapp/templates/clientsideapp/custom_pages/footer.htm
-
1clientsideapp/templates/clientsideapp/custom_pages/main_page.htm
-
2clientsideapp/templates/clientsideapp/custom_pages/service.htm
-
1clientsideapp/templates/clientsideapp/custom_pages/service_bottom.htm
-
6clientsideapp/templates/clientsideapp/debt_buy.html
-
25clientsideapp/templates/clientsideapp/debts.html
-
47clientsideapp/templates/clientsideapp/ext.html
-
71clientsideapp/templates/clientsideapp/index.html
-
7clientsideapp/templates/clientsideapp/modal_service_buy.html
-
44clientsideapp/templates/clientsideapp/services.html
-
12clientsideapp/views.py
-
21devapp/base_intr.py
-
14devapp/dev_types.py
-
5devapp/models.py
-
2devapp/onu_register.sh
-
8devapp/templates/devapp/custom_dev_page/ports.html
-
2devapp/templates/devapp/devices.html
-
23devapp/views.py
-
33djing/auth_backends.py
-
69djing/global_base_views.py
-
2djing/local_settings.py.template
-
16djing/settings.py
-
0djing/templatetags/__init__.py
-
9djing/templatetags/globaltags.py
-
2docs/views.md
-
12global_context_processors.py
-
2install_debian.sh
-
3mapapp/templates/maps/dot.html
-
4mapapp/templates/maps/modal_add_dot.html
-
359migrate_to_0.2.py
-
6msg_app/models.py
-
6queue_mngr.py
-
BINstatic/clientside/bc.png
-
16static/clientside/custom.css
-
BINstatic/img/bcgr.png
-
15static/js/my.js
-
2systemd_units/djing.service
-
2systemd_units/djing_queue.service
-
2systemd_units/djing_rotate.service
-
2systemd_units/djing_telebot.service
-
21systemd_units/webdav_backup.py
-
5taskapp/context_proc.py
-
2taskapp/handle.py
-
6taskapp/locale/ru/LC_MESSAGES/django.po
-
3taskapp/templates/taskapp/add_edit_task.html
-
15taskapp/templates/taskapp/tasklist.html
-
3taskapp/templates/taskapp/tasklist_all.html
-
10taskapp/templates/taskapp/tasklist_failed.html
-
2taskapp/templates/taskapp/tasklist_own.html
-
5taskapp/views.py
-
6templates/all_base.html
@ -0,0 +1 @@ |
|||||
|
Your custom content <i>here</i>. |
||||
@ -0,0 +1 @@ |
|||||
|
<h1>You can change this page</h1> |
||||
@ -0,0 +1,2 @@ |
|||||
|
<h1>Your custom content</h1> |
||||
|
<p>You have service variable {{ active_service }}</p> |
||||
@ -0,0 +1 @@ |
|||||
|
<h1>Your custom content on bottom</h1> |
||||
@ -1,73 +1,4 @@ |
|||||
{% extends 'clientsideapp/ext.html' %} |
{% extends 'clientsideapp/ext.html' %} |
||||
{% block client_main %} |
{% block client_main %} |
||||
|
|
||||
<div class="panel panel-primary"> |
|
||||
<div class="panel-heading">Наши реквизиты</div> |
|
||||
<div class="panel-body"> |
|
||||
<ul> |
|
||||
<li><b>Режим работы:</b> с 9:00 до 22:00</li> |
|
||||
<li><b>Телефоны:</b> +79788328885, +79788318999</li> |
|
||||
<li><b>Адрес:</b> пос. Нижнегорский, ул. Победы 38. 2й этаж старого дома быта, возле рынка</li> |
|
||||
</ul> |
|
||||
<script type="text/javascript" charset="utf-8" async src="https://api-maps.yandex.ru/services/constructor/1.0/js/?um=constructor%3A62221c38a606ad870f2cabc9fd476c8ae1a532993915b73553693f7fb5c7de68&width=100%25&height=654&lang=ru_RU&scroll=true"></script> |
|
||||
</div> |
|
||||
</div> |
|
||||
|
|
||||
<div class="page-header"> |
|
||||
<h3 class="page-header">Тарифы на дополнительные услуги</h3> |
|
||||
|
|
||||
<!--Скачать <a href="/static/clientside/ISPlaylist.m3u">IPTV список каналов</a>, кодировка UTF-8</p>--> |
|
||||
|
|
||||
<table class="table table-striped table-bordered"> |
|
||||
<thead> |
|
||||
<tr> |
|
||||
<th>Услуга</th> |
|
||||
<th>Стоимость (руб)</th> |
|
||||
</tr> |
|
||||
</thead> |
|
||||
<tbody> |
|
||||
<tr> |
|
||||
<td>Выезд мастера. Цена зависит от удалённости от Нижнегорска</td> |
|
||||
<td>100-200</td> |
|
||||
</tr> |
|
||||
<tr> |
|
||||
<td>Настройка роутера</td> |
|
||||
<td>300</td> |
|
||||
</tr> |
|
||||
<tr> |
|
||||
<td>Установка и восстановление сетевых настроек</td> |
|
||||
<td>100</td> |
|
||||
</tr> |
|
||||
<tr> |
|
||||
<td>Замена кабеля (витая пара)</td> |
|
||||
<td>30 руб/метр</td> |
|
||||
</tr> |
|
||||
<tr> |
|
||||
<td>Замена конектора <a href="/static/clientside/rj45.png" target="_blank">RJ-45</a></td> |
|
||||
<td>50</td> |
|
||||
</tr> |
|
||||
<tr> |
|
||||
<td>Роутер <a href="/static/clientside/TL-WR840N-v2.jpg" target="_blank">TL-WR840N</a> + настройка</td> |
|
||||
<td>1800</td> |
|
||||
</tr> |
|
||||
<tr> |
|
||||
<td>Установка драйвера (с настройкой сетевых установок)</td> |
|
||||
<td>100</td> |
|
||||
</tr> |
|
||||
<tr> |
|
||||
<td>"Что-то не работает" – по договорённости</td> |
|
||||
<td>~</td> |
|
||||
</tr> |
|
||||
<tr> |
|
||||
<td>Замена блока питания</td> |
|
||||
<td>200</td> |
|
||||
</tr> |
|
||||
<tr> |
|
||||
<td>Замена оптоволоконных линий связи</td> |
|
||||
<td>от 500</td> |
|
||||
</tr> |
|
||||
</tbody> |
|
||||
</table> |
|
||||
</div> |
|
||||
|
|
||||
|
{% include 'clientsideapp/custom_pages/main_page.htm' %} |
||||
{% endblock %} |
{% endblock %} |
||||
@ -0,0 +1,33 @@ |
|||||
|
from django.contrib.auth.backends import ModelBackend |
||||
|
from accounts_app.models import BaseAccount, UserProfile |
||||
|
from abonapp.models import Abon |
||||
|
|
||||
|
|
||||
|
class CustomAuthBackend(ModelBackend): |
||||
|
def authenticate(self, request, username=None, password=None, **kwargs): |
||||
|
if username is None: |
||||
|
username = kwargs.get(BaseAccount.USERNAME_FIELD) |
||||
|
try: |
||||
|
user = BaseAccount._default_manager.get_by_natural_key(username) |
||||
|
if user.check_password(password): |
||||
|
if user.is_staff: |
||||
|
auser = UserProfile.objects.get_by_natural_key(username) |
||||
|
else: |
||||
|
auser = Abon.objects.get_by_natural_key(username) |
||||
|
if self.user_can_authenticate(auser): |
||||
|
return auser |
||||
|
except BaseAccount.DoesNotExist: |
||||
|
# Run the default password hasher once to reduce the timing |
||||
|
# difference between an existing and a non-existing user (#20760). |
||||
|
BaseAccount().set_password(password) |
||||
|
|
||||
|
def get_user(self, user_id): |
||||
|
try: |
||||
|
user = BaseAccount._default_manager.get(pk=user_id) |
||||
|
if user.is_staff: |
||||
|
user = UserProfile._default_manager.get(pk=user_id) |
||||
|
else: |
||||
|
user = Abon._default_manager.get(pk=user_id) |
||||
|
except BaseAccount.DoesNotExist: |
||||
|
return None |
||||
|
return user if self.user_can_authenticate(user) else None |
||||
@ -0,0 +1,9 @@ |
|||||
|
from django import template |
||||
|
from django.conf import settings |
||||
|
|
||||
|
register = template.Library() |
||||
|
|
||||
|
|
||||
|
@register.simple_tag |
||||
|
def global_var(var_name): |
||||
|
return getattr(settings, var_name, '') |
||||
@ -1,12 +0,0 @@ |
|||||
# -*- coding: utf-8 -*- |
|
||||
from django.shortcuts import get_object_or_404 |
|
||||
from abonapp.models import Abon |
|
||||
from django.conf import settings |
|
||||
|
|
||||
|
|
||||
# От сюда можно получать на клиентской стороне профиль абонента |
|
||||
def context_processor_additional_profile(request): |
|
||||
if request.user.is_staff or request.user.is_anonymous(): |
|
||||
return {'subscriber': request.user, 'FILE_UPLOAD_MAX_MEMORY_SIZE': settings.FILE_UPLOAD_MAX_MEMORY_SIZE} |
|
||||
else: |
|
||||
return {'subscriber': get_object_or_404(Abon, id=request.user.pk), 'FILE_UPLOAD_MAX_MEMORY_SIZE': settings.FILE_UPLOAD_MAX_MEMORY_SIZE} |
|
||||
@ -1,3 +1,3 @@ |
|||||
/usr/bin/bash - |
/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 gettext |
||||
@ -0,0 +1,359 @@ |
|||||
|
#!/usr/bin/env python3 |
||||
|
# -*- coding: utf-8 -*- |
||||
|
import os |
||||
|
import sys |
||||
|
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 |
||||
|
|
||||
|
|
||||
|
def get_fixture_from_unchanget_model(model_name: str, model_class): |
||||
|
""" |
||||
|
Создаёт фикстуру если модели между версиями не изменились |
||||
|
:param model_name: str 'app_label.model_name' |
||||
|
:param model_class: Model модель для которой надо сделать фикстуру |
||||
|
:return: список словарей |
||||
|
""" |
||||
|
print(model_name) |
||||
|
|
||||
|
def get_fields(obj): |
||||
|
fields = dict() |
||||
|
for field in obj._meta.get_fields(): |
||||
|
if isinstance(field, (django_fields.reverse_related.ManyToOneRel, django_fields.reverse_related.ManyToManyRel)): |
||||
|
continue |
||||
|
field_val = getattr(obj, field.name) |
||||
|
if field_val is None: |
||||
|
continue |
||||
|
if isinstance(field, django_fields.related.ManyToManyField): |
||||
|
fields[field.name] = [f.pk for f in field_val.all()] |
||||
|
elif isinstance(field, (django_fields.related.ForeignKey, django.contrib.contenttypes.fields.GenericForeignKey)): |
||||
|
fields[field.name] = field_val.pk |
||||
|
elif isinstance(field, django_fields.FloatField): |
||||
|
fields[field.name] = float(field_val) |
||||
|
elif isinstance(field, django_fields.DateTimeField): |
||||
|
fields[field.name] = str(field_val) |
||||
|
elif isinstance(field, django_fields.AutoField): |
||||
|
continue |
||||
|
else: |
||||
|
fields[field.name] = field_val |
||||
|
return fields |
||||
|
|
||||
|
res = [{ |
||||
|
'model': model_name, |
||||
|
'pk': obj.pk, |
||||
|
'fields': get_fields(obj) |
||||
|
} for obj in model_class.objects.all()] |
||||
|
return res |
||||
|
|
||||
|
|
||||
|
def dump_groups(): |
||||
|
from abonapp import models |
||||
|
print('group_app.group') |
||||
|
res = [{ |
||||
|
'model': 'group_app.group', |
||||
|
'pk': abon_group.pk, |
||||
|
'fields': { |
||||
|
'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.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.abonlog', models.AbonLog) |
||||
|
|
||||
|
print('abonapp.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 |
||||
|
} |
||||
|
} for abon in models.Abon.objects.filter(is_admin=False)] |
||||
|
|
||||
|
res += get_fixture_from_unchanget_model('abonapp.passportinfo', models.PassportInfo) |
||||
|
|
||||
|
res += get_fixture_from_unchanget_model('abonapp.invoiceforpayment', models.InvoiceForPayment) |
||||
|
|
||||
|
res += get_fixture_from_unchanget_model('abonapp.alltimepaylog', models.AllTimePayLog) |
||||
|
|
||||
|
res += get_fixture_from_unchanget_model('abonapp.abonrawpassword', models.AbonRawPassword) |
||||
|
|
||||
|
res += get_fixture_from_unchanget_model('abonapp.additionaltelephone', models.AdditionalTelephone) |
||||
|
|
||||
|
res += get_fixture_from_unchanget_model('abonapp.periodicpayforid', models.PeriodicPayForId) |
||||
|
|
||||
|
return res |
||||
|
|
||||
|
|
||||
|
def dump_tariffs(): |
||||
|
from tariff_app import models |
||||
|
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) |
||||
|
|
||||
|
return res |
||||
|
|
||||
|
|
||||
|
def dump_devs(): |
||||
|
from devapp import models |
||||
|
print('devapp.device') |
||||
|
res = [{ |
||||
|
'model': 'devapp.device', |
||||
|
'pk': dv.pk, |
||||
|
'fields': { |
||||
|
'ip_address': dv.ip_address, |
||||
|
'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, |
||||
|
'snmp_item_num': dv.snmp_item_num, |
||||
|
'status': dv.status, |
||||
|
'is_noticeable': dv.is_noticeable |
||||
|
} |
||||
|
} for dv in models.Device.objects.all()] |
||||
|
|
||||
|
res += get_fixture_from_unchanget_model('devapp.port', models.Port) |
||||
|
return res |
||||
|
|
||||
|
|
||||
|
def dump_accounts(): |
||||
|
from accounts_app import models |
||||
|
from abonapp.models import AbonGroup |
||||
|
|
||||
|
def get_responsibility_groups(account): |
||||
|
responsibility_groups = AbonGroup.objects.filter(profiles__in=[account]) |
||||
|
ids = [ag.pk for ag in responsibility_groups] |
||||
|
return ids |
||||
|
|
||||
|
print('accounts_app.baseaccount') |
||||
|
res = [{ |
||||
|
'model': 'accounts_app.baseaccount', |
||||
|
'pk': up.pk, |
||||
|
'fields': { |
||||
|
'username': up.username, |
||||
|
'fio': up.fio, |
||||
|
'birth_day': up.birth_day, |
||||
|
'is_active': up.is_active, |
||||
|
'is_admin': up.is_admin, |
||||
|
'telephone': up.telephone, |
||||
|
'password': up.password, |
||||
|
'last_login': up.last_login, |
||||
|
'is_superuser': up.is_admin |
||||
|
} |
||||
|
} for up in models.UserProfile.objects.all()] |
||||
|
|
||||
|
print('accounts_app.userprofile') |
||||
|
res += [{ |
||||
|
'model': 'accounts_app.userprofile', |
||||
|
'pk': up.pk, |
||||
|
'fields': { |
||||
|
'avatar': up.avatar.pk if up.avatar else None, |
||||
|
'email': up.email, |
||||
|
'responsibility_groups': get_responsibility_groups(up) |
||||
|
} |
||||
|
} for up in models.UserProfile.objects.filter(is_admin=True)] |
||||
|
|
||||
|
return res |
||||
|
|
||||
|
|
||||
|
def dump_photos(): |
||||
|
from photo_app.models import Photo |
||||
|
print('photo_app.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 |
||||
|
|
||||
|
|
||||
|
def dump_chatbot(): |
||||
|
from chatbot import models |
||||
|
res = get_fixture_from_unchanget_model('chatbot.telegrambot', models.TelegramBot) |
||||
|
res += get_fixture_from_unchanget_model('chatbot.messagehistory', models.MessageHistory) |
||||
|
res += get_fixture_from_unchanget_model('chatbot.messagequeue', models.MessageQueue) |
||||
|
return res |
||||
|
|
||||
|
|
||||
|
def dump_map(): |
||||
|
from mapapp import models |
||||
|
res = get_fixture_from_unchanget_model('mapapp.dot', models.Dot) |
||||
|
return res |
||||
|
|
||||
|
|
||||
|
def dump_task_app(): |
||||
|
from taskapp import models |
||||
|
res = get_fixture_from_unchanget_model('taskapp.changelog', models.ChangeLog) |
||||
|
res += get_fixture_from_unchanget_model('taskapp.task', models.Task) |
||||
|
res += get_fixture_from_unchanget_model('taskapp.ExtraComment', models.ExtraComment) |
||||
|
return res |
||||
|
|
||||
|
|
||||
|
def dump_auth(): |
||||
|
from django.contrib.auth import models |
||||
|
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 |
||||
|
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 |
||||
|
|
||||
|
|
||||
|
def make_migration(): |
||||
|
from datetime import datetime, date |
||||
|
|
||||
|
def my_date_converter(o): |
||||
|
if isinstance(o, datetime) or isinstance(o, date): |
||||
|
return "%s" % o |
||||
|
|
||||
|
def appdump(path, func): |
||||
|
fname = os.path.join(*path) |
||||
|
path_dir = os.path.join(*path[:-1]) |
||||
|
if not os.path.isdir(path_dir): |
||||
|
os.mkdir(path_dir) |
||||
|
with open(fname, 'w') as f: |
||||
|
dump(func(), f, default=my_date_converter, ensure_ascii=False) |
||||
|
|
||||
|
if not os.path.isdir('fixtures'): |
||||
|
os.mkdir('fixtures') |
||||
|
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', '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) |
||||
|
|
||||
|
|
||||
|
def move_to_fixtures_dirs(): |
||||
|
fixdir = 'fixtures' |
||||
|
for dr in os.listdir(fixdir): |
||||
|
fixture_dir = os.path.join(fixdir, dr) |
||||
|
for fixture_file in os.listdir(fixture_dir): |
||||
|
from_file = os.path.join(fixture_dir, fixture_file) |
||||
|
dst_dir = os.path.join(dr, fixdir) |
||||
|
to_file = os.path.join(dst_dir, fixture_file) |
||||
|
if not os.path.isdir(dst_dir): |
||||
|
os.mkdir(dst_dir) |
||||
|
shutil.copyfile(from_file, to_file) |
||||
|
print('cp %s -> %s' % (from_file, to_file)) |
||||
|
|
||||
|
|
||||
|
def apply_fixtures(): |
||||
|
from django.core.management import execute_from_command_line |
||||
|
from accounts_app.models import UserProfile |
||||
|
#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() |
||||
|
|
||||
|
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' |
||||
|
print('./manage.py loaddata ' + ', '.join(fixtures_names)) |
||||
|
execute_from_command_line([sys.argv[0], 'loaddata'] + fixtures_names) |
||||
|
|
||||
|
|
||||
|
if __name__ == '__main__': |
||||
|
if len(sys.argv) < 2: |
||||
|
print('Usage: ./migrate_to_0.2.py [makedump OR applydump]') |
||||
|
exit(1) |
||||
|
choice = sys.argv[1] |
||||
|
if choice == 'applydump': |
||||
|
django.setup() |
||||
|
move_to_fixtures_dirs() |
||||
|
apply_fixtures() |
||||
|
shutil.rmtree('fixtures') |
||||
|
elif choice == 'makedump': |
||||
|
django.setup() |
||||
|
make_migration() |
||||
|
else: |
||||
|
print('Unexpected choice') |
||||
|
Before Width: 80 | Height: 71 | Size: 8.7 KiB After Width: 80 | Height: 80 | Size: 4.2 KiB |
|
Before Width: 57 | Height: 50 | Size: 6.0 KiB After Width: 50 | Height: 49 | Size: 2.0 KiB |
@ -1,12 +1,13 @@ |
|||||
from django.contrib.auth.models import AnonymousUser |
from django.contrib.auth.models import AnonymousUser |
||||
|
|
||||
from taskapp.models import Task |
from taskapp.models import Task |
||||
|
from accounts_app.models import UserProfile |
||||
|
|
||||
|
|
||||
def get_active_tasks_count(request): |
def get_active_tasks_count(request): |
||||
tasks_count = 0 |
tasks_count = 0 |
||||
if not isinstance(request.user, AnonymousUser): |
|
||||
tasks_count = Task.objects.filter(recipients=request.user, state='S').count() |
|
||||
|
if isinstance(request.user, UserProfile): |
||||
|
tasks_count = Task.objects.filter(recipients__in=[request.user], state='S').count() |
||||
return { |
return { |
||||
'tasks_count': tasks_count |
'tasks_count': tasks_count |
||||
} |
} |
||||
Write
Preview
Loading…
Cancel
Save
Reference in new issue