diff --git a/abonapp/locale/ru/LC_MESSAGES/django.po b/abonapp/locale/ru/LC_MESSAGES/django.po index 27b7a3f..5bb4ba3 100644 --- a/abonapp/locale/ru/LC_MESSAGES/django.po +++ b/abonapp/locale/ru/LC_MESSAGES/django.po @@ -1138,3 +1138,6 @@ msgstr "Абоненты" msgid "Successfully saved" msgstr "Успешно сохранено" + +msgid "This user can not buy admin services" +msgstr "Этот пользователь не может назначать административные услуги" diff --git a/abonapp/models.py b/abonapp/models.py index 462f45e..7caf11b 100644 --- a/abonapp/models.py +++ b/abonapp/models.py @@ -202,8 +202,11 @@ class Abon(BaseAccount): amount = round(tariff.amount, 2) - if not author.is_staff and tariff.is_admin: - raise LogicError(_('User that is no staff can not buy admin services')) + if tariff.is_admin: + if author is not None and not author.is_staff: + raise LogicError(_('User that is no staff can not buy admin services')) + else: + raise LogicError(_('This user can not buy admin services')) if self.current_tariff is not None: if self.current_tariff.tariff == tariff: @@ -347,7 +350,6 @@ class AllTimePayLogManager(models.Manager): r = cur.fetchone() if r is None: break summ, dat = r - print(summ, dat) yield {'summ': summ, 'pay_date': datetime.strptime(dat, '%Y-%m-%d')} diff --git a/abonapp/templates/abonapp/log.html b/abonapp/templates/abonapp/log.html index e8ef0e9..d180fc9 100644 --- a/abonapp/templates/abonapp/log.html +++ b/abonapp/templates/abonapp/log.html @@ -39,7 +39,12 @@ {{ l.comment }} {{ l.date|date:"D d E Y H:i:s" }} - {{ l.author.username }} + + {% if l.author %} + {{ l.author.username }} + {% else %} + --- + {% endif %} {% empty %} diff --git a/abonapp/views.py b/abonapp/views.py index 4f5a258..32e99bb 100644 --- a/abonapp/views.py +++ b/abonapp/views.py @@ -402,8 +402,8 @@ def unsubscribe_service(request, gid, uid, abon_tariff_id): try: abon = get_object_or_404(models.Abon, pk=uid) abon_tariff = get_object_or_404(models.AbonTariff, pk=int(abon_tariff_id)) - abon_tariff.delete() abon.sync_with_nas(created=False) + abon_tariff.delete() messages.success(request, _('User has been detached from service')) except NasFailedResult as e: messages.error(request, e) diff --git a/clientsideapp/locale/ru/LC_MESSAGES/django.po b/clientsideapp/locale/ru/LC_MESSAGES/django.po index 79077a7..23cef2a 100644 --- a/clientsideapp/locale/ru/LC_MESSAGES/django.po +++ b/clientsideapp/locale/ru/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-08 14:24+0300\n" +"POT-Creation-Date: 2018-03-18 00:15+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Dmitry Novikov nerosketch@gmail.com\n" "Language: ru\n" @@ -32,31 +32,25 @@ msgid "Are you sure you want to spend a payment?" msgstr "Вы уверены что хотите провести платёж?" #: templates/clientsideapp/debt_buy.html:21 -#, fuzzy, python-format -#| msgid "" -#| "From your account, they withdraw funds in %(amount)s rub.
\n" -#| "As a result, you will remain on your account %(ballance_after)s rubles. " -#| "
\n" -#| "The administrator can immediately see that you shut down the debt." +#, python-format msgid "" -"From your account, they withdraw funds in %(amount)s rub.
\n" -"As a result, you will remain on your account %(ballance_after)s rubles.
\n" -"The administrator can immediately see that you shut down the debt." +"From your account, they withdraw funds in %(amount)s rub.
As a " +"result, you will remain on your account %(ballance_after)s rubles.
The " +"administrator can immediately see that you shut down the debt." msgstr "" -"С вашего счёта снимутся средства в размере %(amount)s руб.
\n" -"В результате у вас на счету останется %(ballance_after)s руб.
\n" -"Администратор сразу сможет видеть что у вас закрыта задолженность." +"С вашего счёта снимутся средства в размере %(amount)s руб.
В " +"результате у вас на счету останется %(ballance_after)s руб.
Администратор сразу сможет видеть что у вас закрыта задолженность." -#: templates/clientsideapp/debt_buy.html:24 +#: templates/clientsideapp/debt_buy.html:26 msgid "Description of payment" msgstr "Описание платежа" -#: templates/clientsideapp/debt_buy.html:32 +#: templates/clientsideapp/debt_buy.html:34 msgid "Confirm" msgstr "Подтвердить" -#: templates/clientsideapp/debt_buy.html:35 +#: templates/clientsideapp/debt_buy.html:37 msgid "Cancel" msgstr "Отменить" @@ -107,7 +101,7 @@ msgstr "У вас нет проведённых платежей" #: templates/clientsideapp/services.html:25 msgid "currency" -msgstr "" +msgstr "руб." #: views.py:51 #, python-format @@ -127,7 +121,7 @@ msgstr "Вы не уверены что хотите оплатить долг?" msgid "Your account have not enough money" msgstr "Недостаточно средств на счету" -#: views.py:90 +#: views.py:89 #, python-format msgid "%(username)s paid the debt %(amount).2f" msgstr "%(username)s заплатил долг в размере %(amount).2f" diff --git a/clientsideapp/templates/clientsideapp/debt_buy.html b/clientsideapp/templates/clientsideapp/debt_buy.html index 510fbe8..dc14472 100644 --- a/clientsideapp/templates/clientsideapp/debt_buy.html +++ b/clientsideapp/templates/clientsideapp/debt_buy.html @@ -18,9 +18,11 @@ {% trans 'Are you sure you want to spend a payment?' %} -

{% blocktrans %}From your account, they withdraw funds in {{ amount }} rub.
-As a result, you will remain on your account {{ ballance_after }} rubles.
-The administrator can immediately see that you shut down the debt.{% endblocktrans %}

+

{% blocktrans trimmed %} + From your account, they withdraw funds in {{ amount }} rub.
+ As a result, you will remain on your account {{ ballance_after }} rubles.
+ The administrator can immediately see that you shut down the debt. + {% endblocktrans %}

{% trans 'Description of payment' %}

@@ -38,4 +40,4 @@ The administrator can immediately see that you shut down the debt.{% endblocktra
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/clientsideapp/templates/clientsideapp/modal_service_buy.html b/clientsideapp/templates/clientsideapp/modal_service_buy.html index 93d6d7d..0077603 100644 --- a/clientsideapp/templates/clientsideapp/modal_service_buy.html +++ b/clientsideapp/templates/clientsideapp/modal_service_buy.html @@ -12,9 +12,10 @@

{{ service.descr }}

- +Cost: {{ amount }} rubles.{% endblocktrans %} #}

-->

Стоимость {{ service.amount }} руб.

diff --git a/clientsideapp/views.py b/clientsideapp/views.py index fe7db8b..b9ee31a 100644 --- a/clientsideapp/views.py +++ b/clientsideapp/views.py @@ -28,7 +28,7 @@ def pays(request): @login_required def services(request): try: - abon = Abon.objects.get(pk=request.user.pk) + abon = request.user all_tarifs = Tariff.objects.get_tariffs_by_group(abon.group.pk) current_service = abon.active_tariff() except Abon.DoesNotExist: @@ -43,14 +43,14 @@ def services(request): @login_required @transaction.atomic def buy_service(request, srv_id): - abon = get_object_or_404(Abon, pk=request.user.pk) + abon = request.user service = get_object_or_404(Tariff, pk=srv_id) try: current_service = abon.active_tariff() if request.method == 'POST': - abon.pick_tariff(service, request.user, _("Buy the service via user side, service '%s'") + abon.pick_tariff(service, None, _("Buy the service via user side, service '%s'") % service) - abon.abon.sync_with_nas(created=False) + abon.sync_with_nas(created=False) messages.success(request, _("The service '%s' wan successfully activated") % service.title) else: return render_to_text('clientsideapp/modal_service_buy.html', { @@ -76,7 +76,7 @@ def debts_list(request): @transaction.atomic def debt_buy(request, d_id): debt = get_object_or_404(InvoiceForPayment, id=d_id) - abon = get_object_or_404(Abon, id=request.user.id) + abon = request.user if request.method == 'POST': try: sure = request.POST.get('sure') @@ -86,7 +86,7 @@ def debt_buy(request, d_id): raise LogicError(_('Your account have not enough money')) amount = -debt.amount - abon.add_ballance(request.user, amount, comment=gettext('%(username)s paid the debt %(amount).2f') % { + abon.add_ballance(None, amount, comment=gettext('%(username)s paid the debt %(amount).2f') % { 'username': abon.get_full_name(), 'amount': amount }) diff --git a/devapp/models.py b/devapp/models.py index 4b51c06..1fa4fac 100644 --- a/devapp/models.py +++ b/devapp/models.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- import requests -from django.db import models +from django.db import models, ProgrammingError from djing.fields import MACAddressField from .base_intr import DevBase from mydefs import MyGenericIPAddressField, MyChoicesAdapter, ip2int @@ -107,6 +107,7 @@ class Device(models.Model): def update_dhcp(self): if self.devtype not in ('On','Dl'): return + raise ProgrammingError('переделать это безобразие') # FIXME: переделать это безобразие grp = self.user_group.id code = '' diff --git a/devapp/templates/devapp/devices.html b/devapp/templates/devapp/devices.html index 8f380f2..414701a 100644 --- a/devapp/templates/devapp/devices.html +++ b/devapp/templates/devapp/devices.html @@ -41,7 +41,7 @@ - {% with can_del_dev=perms.devapp.delete_device can_ch_dev=perms.devapp.change_device grpid=dev.group.pk %} + {% with can_del_dev=perms.devapp.delete_device can_ch_dev=perms.devapp.change_device grpid=group.id %} {% for dev in devices %} diff --git a/djing/auth_backends.py b/djing/auth_backends.py new file mode 100644 index 0000000..aa8438e --- /dev/null +++ b/djing/auth_backends.py @@ -0,0 +1,42 @@ +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) + print('username', username) + try: + user = BaseAccount._default_manager.get_by_natural_key(username) + print('user', user) + if user.check_password(password): + if user.is_admin: + print('is adm') + auser = UserProfile.objects.get_by_natural_key(username) + else: + print('no adm') + auser = Abon.objects.get_by_natural_key(username) + if self.user_can_authenticate(auser): + print('can auth') + return auser + print('no can auth') + else: + print('wrong password') + except BaseAccount.DoesNotExist: + print('does not exist') + # 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_admin: + 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 diff --git a/djing/settings.py b/djing/settings.py index 29e1bf2..93380e0 100644 --- a/djing/settings.py +++ b/djing/settings.py @@ -19,13 +19,14 @@ from django.urls import reverse_lazy SECRET_KEY = local_settings.SECRET_KEY # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = local_settings.DEBUG or False +DEBUG = local_settings.DEBUG ALLOWED_HOSTS = local_settings.ALLOWED_HOSTS # required for django-guardian AUTHENTICATION_BACKENDS = ( - 'django.contrib.auth.backends.ModelBackend', # default + 'djing.auth_backends.CustomAuthBackend', + #'django.contrib.auth.backends.ModelBackend', # default 'guardian.backends.ObjectPermissionBackend' ) diff --git a/msg_app/models.py b/msg_app/models.py index 0965b38..9319448 100644 --- a/msg_app/models.py +++ b/msg_app/models.py @@ -124,8 +124,10 @@ class ConversationManager(models.Manager): return conversation def get_new_messages_count(self, account): - ms_count = MessageStatus.objects.filter(user=account, state='new').count() - return ms_count + if isinstance(account, UserProfile): + return MessageStatus.objects.filter(user=account, state='new').count() + else: + return 0 def fetch(self, account): conversations = self.filter(models.Q(author=account) | models.Q(participants__in=[account])).annotate( diff --git a/taskapp/context_proc.py b/taskapp/context_proc.py index bc8d905..3bbdef8 100644 --- a/taskapp/context_proc.py +++ b/taskapp/context_proc.py @@ -1,12 +1,13 @@ from django.contrib.auth.models import AnonymousUser from taskapp.models import Task +from accounts_app.models import UserProfile def get_active_tasks_count(request): 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 { 'tasks_count': tasks_count } diff --git a/taskapp/handle.py b/taskapp/handle.py index c5c136b..0530270 100644 --- a/taskapp/handle.py +++ b/taskapp/handle.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ from chatbot.telebot import send_notify from chatbot.models import ChatException from mydefs import MultipleException diff --git a/taskapp/locale/ru/LC_MESSAGES/django.po b/taskapp/locale/ru/LC_MESSAGES/django.po index 23dd5c5..8a10f0a 100644 --- a/taskapp/locale/ru/LC_MESSAGES/django.po +++ b/taskapp/locale/ru/LC_MESSAGES/django.po @@ -34,7 +34,7 @@ msgstr "с. %s\n" msgid "" "address %(street)s %(house)s.\n" "telephone %(telephone)s\n" -msgstr "по адресу %s %s тел. %s.\n" +msgstr "по адресу %(street)s %(house)s тел. %(telephone)s.\n" #: handle.py:31 models.py:25 msgid "not chosen"