diff --git a/abonapp/forms.py b/abonapp/forms.py index 20c4cdf..ea1a35a 100644 --- a/abonapp/forms.py +++ b/abonapp/forms.py @@ -49,13 +49,13 @@ class AbonForm(forms.ModelForm): username = forms.CharField(max_length=127, required=False, initial=generate_random_username, widget=forms.TextInput(attrs={ 'placeholder': _('login'), - 'class': "form-control", - 'required': '' + 'required': '', + 'pattern': r'^\w{1,127}$' })) - password = forms.CharField(max_length=64, initial=generate_random_password, - widget=forms.TextInput( - attrs={'class': 'form-control', 'type': 'password', 'autocomplete': 'new-password'})) + password = forms.CharField(max_length=64, initial=generate_random_password, widget=forms.TextInput(attrs={ + 'class': 'form-control', 'type': 'password', 'autocomplete': 'new-password' + })) class Meta: model = models.Abon @@ -102,9 +102,9 @@ class PassportForm(forms.ModelForm): model = models.PassportInfo exclude = ['abon'] widgets = { - 'series': forms.TextInput(attrs={'class': 'form-control', 'required': '', 'pattern': '^\d{4}$'}), - 'number': forms.TextInput(attrs={'class': 'form-control', 'required': '', 'pattern': '^\d{6}$'}), - 'distributor': forms.TextInput(attrs={'class': 'form-control', 'required': ''}), + 'series': forms.TextInput(attrs={'required': '', 'pattern': '^\d{4}$'}), + 'number': forms.TextInput(attrs={'required': '', 'pattern': '^\d{6}$'}), + 'distributor': forms.TextInput(attrs={'required': ''}), 'date_of_acceptance': forms.DateInput(attrs={'class': 'form-control', 'required': ''}) } initials = { diff --git a/abonapp/models.py b/abonapp/models.py index 94d1faa..b1aecc6 100644 --- a/abonapp/models.py +++ b/abonapp/models.py @@ -297,9 +297,9 @@ class Abon(BaseAccount): class PassportInfo(models.Model): - series = models.CharField(max_length=4, validators=[validators.integer_validator]) - number = models.CharField(max_length=6, validators=[validators.integer_validator]) - distributor = models.CharField(max_length=64) + series = models.CharField(_('Pasport serial'), max_length=4, validators=[validators.integer_validator]) + number = models.CharField(_('Pasport number'), max_length=6, validators=[validators.integer_validator]) + distributor = models.CharField(_('Distributor'), max_length=64) date_of_acceptance = models.DateField() abon = models.OneToOneField(Abon, on_delete=models.SET_NULL, blank=True, null=True) diff --git a/abonapp/templates/abonapp/addInvoice.html b/abonapp/templates/abonapp/addInvoice.html index a2a98bf..8237c05 100644 --- a/abonapp/templates/abonapp/addInvoice.html +++ b/abonapp/templates/abonapp/addInvoice.html @@ -6,7 +6,7 @@
  • {% trans 'User groups' %}
  • {{ group.title }}
    • -
  • {{ abon.fio }}
    • +
  • {{ abon.fio }}
  • {% trans 'Add debt' %}
    • @@ -15,11 +15,11 @@

    {% trans 'Add receipt for' %} - {{ abon.fio }} + {{ abon.fio }}

    -
    {% csrf_token %}
    diff --git a/abonapp/templates/abonapp/buy_tariff.html b/abonapp/templates/abonapp/buy_tariff.html index 1aae249..67ed5ba 100644 --- a/abonapp/templates/abonapp/buy_tariff.html +++ b/abonapp/templates/abonapp/buy_tariff.html @@ -6,7 +6,7 @@
  • {% trans 'User groups' %}
  • {{ group.title }}
    • -
  • {{ abon.fio }}
    • +
  • {{ abon.fio }}
  • {% trans 'Pick a service' %}
    • @@ -15,11 +15,11 @@

    {% trans 'Pick a service for' %} - {% trans 'Sub' %} + {% trans 'Sub' %}

    - {% csrf_token %}
    {% if tariffs %} diff --git a/abonapp/templates/abonapp/charts.html b/abonapp/templates/abonapp/charts.html index 58bfbc0..2f55c5b 100644 --- a/abonapp/templates/abonapp/charts.html +++ b/abonapp/templates/abonapp/charts.html @@ -43,7 +43,7 @@ {% else %}

    {% trans 'Static info was Not found' %}

    {% endif %} - +
    - {% csrf_token %} + {% csrf_token %} {% bootstrap_field form.username label_class='col-sm-4' field_class='col-sm-8' form_group_class='form-group-sm' %} {% bootstrap_field form.fio label_class='col-sm-4' field_class='col-sm-8' form_group_class='form-group-sm' %} @@ -24,10 +24,10 @@ - + - + @@ -41,7 +41,7 @@
    - + @@ -116,7 +116,7 @@
    - {% csrf_token %} + {% csrf_token %}
    @@ -125,11 +125,11 @@ {{ device.comment|truncatechars:11 }} {{ device.ip_address }} - + {% else %} - + {% trans 'Add clutch' %} {% endif %} @@ -177,7 +177,7 @@

    {% trans 'Extra fields' %}

    - {% csrf_token %} + {% csrf_token %} {% for ef in abon.extra_fields.all %}
    @@ -188,7 +188,7 @@ - + @@ -202,7 +202,7 @@
    - + {% trans 'Add' %} @@ -227,7 +227,7 @@
    - + {% trans 'Edit' %}
    diff --git a/abonapp/templates/abonapp/ext.htm b/abonapp/templates/abonapp/ext.htm index a6e11b7..de10f19 100644 --- a/abonapp/templates/abonapp/ext.htm +++ b/abonapp/templates/abonapp/ext.htm @@ -21,39 +21,39 @@
      - {% url 'abonapp:abon_home' group.pk abon.pk as abon_home %} + {% url 'abonapp:abon_home' group.pk abon.username as abon_home %} {% trans 'Sub information' %} - {% url 'abonapp:abon_services' group.pk abon.pk as abserv %} + {% url 'abonapp:abon_services' group.pk abon.username as abserv %} {% trans 'Services' %} {% if perms.abonapp.can_view_passport %} - {% url 'abonapp:passport_view' group.pk abon.pk as passport_view_url %} + {% url 'abonapp:passport_view' group.pk abon.username as passport_view_url %} {% trans 'Passport information' %} {% endif %} - {% url 'abonapp:abon_phistory' group.pk abon.pk as abphist %} + {% url 'abonapp:abon_phistory' group.pk abon.username as abphist %} {% trans 'Payments' %} - {% url 'abonapp:task_log' group.pk abon.pk as abtasklog %} + {% url 'abonapp:task_log' group.pk abon.username as abtasklog %} {% trans 'History of tasks' %} - {% url 'abonapp:charts' group.pk abon.pk as abtasklog %} + {% url 'abonapp:charts' group.pk abon.username as abtasklog %} {% trans 'Charts' %} - {% url 'abonapp:dials' group.pk abon.pk as abdials %} + {% url 'abonapp:dials' group.pk abon.username as abdials %} {% trans 'Dialing' %} diff --git a/abonapp/templates/abonapp/invoiceForPayment.html b/abonapp/templates/abonapp/invoiceForPayment.html index 1d12a56..6e96c96 100644 --- a/abonapp/templates/abonapp/invoiceForPayment.html +++ b/abonapp/templates/abonapp/invoiceForPayment.html @@ -6,7 +6,7 @@
    • {% trans 'User groups' %}
    • {{ group.title }}
      • -
    • {{ abon.fio }}
      • +
    • {{ abon.fio }}
    • {% trans 'Debts' %}
      • @@ -57,7 +57,7 @@ - + {% trans 'Add debt' %} diff --git a/abonapp/templates/abonapp/log.html b/abonapp/templates/abonapp/log.html index d180fc9..19d7edd 100644 --- a/abonapp/templates/abonapp/log.html +++ b/abonapp/templates/abonapp/log.html @@ -32,7 +32,7 @@ {% endif %} {{ l.amount }} {% if l.abon.group %} - {{ l.abon.username }} + {{ l.abon.username }} {% else %} {{ l.abon.username }} {% endif %} diff --git a/abonapp/templates/abonapp/modal_abonamount.html b/abonapp/templates/abonapp/modal_abonamount.html index 44d6fb2..e2db968 100644 --- a/abonapp/templates/abonapp/modal_abonamount.html +++ b/abonapp/templates/abonapp/modal_abonamount.html @@ -1,5 +1,5 @@ {% load i18n %} - {% csrf_token %} + {% csrf_token %}

      {% trans 'Additional sum' %}

      @@ -14,7 +14,7 @@
    -
    +

    {% trans 'Add telephone' %}

    diff --git a/abonapp/templates/abonapp/modal_additional_telephones.html b/abonapp/templates/abonapp/modal_additional_telephones.html index 5782e6b..e88bd81 100644 --- a/abonapp/templates/abonapp/modal_additional_telephones.html +++ b/abonapp/templates/abonapp/modal_additional_telephones.html @@ -1,5 +1,4 @@ {% load i18n %} -

    {% trans 'Additional telephones' %}

    @@ -21,7 +20,7 @@ {{ t.owner_name }} {{ t.telephone }} - + diff --git a/abonapp/templates/abonapp/modal_dev.html b/abonapp/templates/abonapp/modal_dev.html index 38902f2..128d248 100644 --- a/abonapp/templates/abonapp/modal_dev.html +++ b/abonapp/templates/abonapp/modal_dev.html @@ -1,6 +1,6 @@ {% load i18n %} - {% csrf_token %} + {% csrf_token %}

    {% trans 'Add clutch' %}

    diff --git a/abonapp/templates/abonapp/modal_extra_field.html b/abonapp/templates/abonapp/modal_extra_field.html index 6a2caf0..7f2ff2f 100644 --- a/abonapp/templates/abonapp/modal_extra_field.html +++ b/abonapp/templates/abonapp/modal_extra_field.html @@ -1,6 +1,6 @@ {% load i18n %} - {% csrf_token %} + {% csrf_token %}

    {% trans 'Add extra field' %}

    diff --git a/abonapp/templates/abonapp/modal_periodic_pay.html b/abonapp/templates/abonapp/modal_periodic_pay.html index ccbaf82..ee51e8e 100644 --- a/abonapp/templates/abonapp/modal_periodic_pay.html +++ b/abonapp/templates/abonapp/modal_periodic_pay.html @@ -1,6 +1,6 @@ {% load i18n %} {% load bootstrap3 %} -{% csrf_token %} +{% csrf_token %}

    {% trans 'Add periodic pay' %}

    diff --git a/abonapp/templates/abonapp/modal_user_markers.html b/abonapp/templates/abonapp/modal_user_markers.html index 934535b..282aa88 100644 --- a/abonapp/templates/abonapp/modal_user_markers.html +++ b/abonapp/templates/abonapp/modal_user_markers.html @@ -1,5 +1,5 @@ {% load i18n %} - {% csrf_token %} + {% csrf_token %}
    diff --git a/abonapp/templates/abonapp/passport_view.html b/abonapp/templates/abonapp/passport_view.html index 2998df3..8699829 100644 --- a/abonapp/templates/abonapp/passport_view.html +++ b/abonapp/templates/abonapp/passport_view.html @@ -1,5 +1,6 @@ {% extends request.is_ajax|yesno:'nullcont.htm,abonapp/ext.htm' %} {% load i18n %} +{% load bootstrap3 %} {% block content %}
    @@ -9,26 +10,12 @@

    {% trans 'Passport information' %}

    - {% csrf_token %} + {% csrf_token %} + + {% bootstrap_field frm.series label_class='col-sm-3' field_class='col-sm-9' form_group_class='form-group-sm' %} + {% bootstrap_field frm.number label_class='col-sm-3' field_class='col-sm-9' form_group_class='form-group-sm' %} + {% bootstrap_field frm.distributor label_class='col-sm-3' field_class='col-sm-9' form_group_class='form-group-sm' %} -
    - -
    - {{ frm.series }}{{ frm.series.errors }} -
    -
    -
    - -
    - {{ frm.number }}{{ frm.number.errors }} -
    -
    -
    - -
    - {{ frm.distributor }}{{ frm.distributor.errors }} -
    -
    diff --git a/abonapp/templates/abonapp/payHistory.html b/abonapp/templates/abonapp/payHistory.html index cc14161..64715c9 100644 --- a/abonapp/templates/abonapp/payHistory.html +++ b/abonapp/templates/abonapp/payHistory.html @@ -36,7 +36,7 @@ {% if perms.abonapp.can_add_ballance %} - + {% trans 'Fill account' %} {% else %} @@ -44,7 +44,7 @@ {% trans 'Fill account' %} {% endif %} - + {% trans 'Debts' %} diff --git a/abonapp/templates/abonapp/peoples.html b/abonapp/templates/abonapp/peoples.html index f22e2e9..c0bc2ce 100644 --- a/abonapp/templates/abonapp/peoples.html +++ b/abonapp/templates/abonapp/peoples.html @@ -77,7 +77,7 @@ {% endif %} - {{ human.username }} + {{ human.username }} {% if human.stat_cache %} diff --git a/abonapp/templates/abonapp/service.html b/abonapp/templates/abonapp/service.html index 210d953..92636bd 100644 --- a/abonapp/templates/abonapp/service.html +++ b/abonapp/templates/abonapp/service.html @@ -49,13 +49,13 @@ {% else %} {% trans 'Subscriber has no service' %}. - + {% trans 'Buy service' %} {% endif %} {% if abon_tariff %} - + {% trans 'Finish service' %} {% endif %} @@ -82,7 +82,7 @@ {% with can_ch_trf=perms.tariff_app.change_tariff %} {% for service in services %} - @@ -131,11 +131,11 @@
    {% trans 'Next time to pay' %}
    {{ periodic_pay.next_pay|date:'d E Y' }}
    - + {% trans 'Remove periodic pay' %} {% else %} - + {% trans 'Add periodic pay' %} {% endif %} diff --git a/abonapp/urls.py b/abonapp/urls.py index 5bb1b1d..b9d30ee 100644 --- a/abonapp/urls.py +++ b/abonapp/urls.py @@ -2,16 +2,56 @@ from django.conf.urls import url, include from . import views - app_name = 'abonapp' +subscriber_patterns = [ + url(r'^$', views.abonhome, name='abon_home'), + url(r'^services/$', views.abon_services, name='abon_services'), + url(r'^amount/$', views.abonamount, name='abon_amount'), + url(r'^debts/$', views.DebtsListView.as_view(), name='abon_debts'), + url(r'^pay/$', views.PayHistoryListView.as_view(), name='abon_phistory'), + url(r'^addinvoice/$', views.add_invoice, name='add_invoice'), + url(r'^pick/$', views.pick_tariff, name='pick_tariff'), + url(r'^passport_view/$', views.passport_view, name='passport_view'), + url(r'^chart/$', views.charts, name='charts'), + url(r'^dials/$', views.DialsListView.as_view(), name='dials'), + url(r'^reset_ip/$', views.reset_ip, name='reset_ip'), + url(r'^extra_field/$', views.make_extra_field, name='extra_field'), + url(r'^extra_field/(?P\d+)/delete$', views.extra_field_delete, name='extra_field_delete'), + url(r'^extra_field/edit$', views.extra_field_change, name='extra_field_edit'), + url(r'^unsubscribe_service(?P\d+)/$', views.unsubscribe_service, name='unsubscribe_service'), + url(r'^dev/$', views.dev, name='dev'), + url(r'^clear_dev/$', views.clear_dev, name='clear_dev'), + url(r'^task_log/$', views.TaskLogListView.as_view(), name='task_log'), + url(r'^user_dev/$', views.save_user_dev_port, name='save_user_dev_port'), + url(r'^telephones/$', views.tels, name='telephones'), + url(r'^tel/add/$', views.tel_add, name='telephone_new'), + url(r'^tel/del/$', views.tel_del, name='telephone_del'), + url(r'^markers/$', views.EditSibscriberMarkers.as_view(), name='markers_edit'), + url(r'^periodic_pay$', views.add_edit_periodic_pay, name='add_periodic_pay'), + url(r'^periodic_pay(?P\d+)/$', views.add_edit_periodic_pay, name='add_periodic_pay'), + url(r'^periodic_pay(?P\d+)/del/$', views.del_periodic_pay, name='del_periodic_pay') +] + +group_patterns = [ + url(r'^$', views.PeoplesListView.as_view(), name='people_list'), + url(r'^addabon$', views.addabon, name='add_abon'), + url(r'^services$', views.chgroup_tariff, name='ch_group_tariff'), + url(r'^phonebook$', views.phonebook, name='phonebook'), + url(r'^export$', views.abon_export, name='abon_export'), + url(r'^street/add$', views.street_add, name='street_add'), + url(r'^street/edit', views.street_edit, name='street_edit'), + url(r'^street/(?P\d+)/delete$', views.street_del, name='street_del'), + url(r'^(?P\w{1,127})/', include(subscriber_patterns)) +] + urlpatterns = [ url(r'^$', views.GroupListView.as_view(), name='group_list'), url(r'^fin_report$', views.fin_report, name='fin_report'), - url(r'^(?P\d+)/', include('abonapp.urls_abon')), + url(r'^(?P\d+)/', include(group_patterns)), url(r'^log$', views.LogListView.as_view(), name='log'), diff --git a/abonapp/urls_abon.py b/abonapp/urls_abon.py deleted file mode 100644 index 7299b78..0000000 --- a/abonapp/urls_abon.py +++ /dev/null @@ -1,49 +0,0 @@ -from django.conf.urls import url -from . import views - - -urlpatterns = [ - url(r'^$', views.PeoplesListView.as_view(), name='people_list'), - url(r'^addabon$', views.addabon, name='add_abon'), - url(r'^services$', views.chgroup_tariff, name='ch_group_tariff'), - url(r'^phonebook$', views.phonebook, name='phonebook'), - url(r'^export$', views.abon_export, name='abon_export'), - url(r'^street/add$', views.street_add, name='street_add'), - url(r'^street/edit', views.street_edit, name='street_edit'), - url(r'^street/(?P\d+)/delete$', views.street_del, name='street_del'), - url(r'^(?P\d+)$', views.abonhome, name='abon_home'), - - url(r'^(?P\d+)/services$', views.abon_services, name='abon_services'), - url(r'^(?P\d+)/amount', views.abonamount, name='abon_amount'), - url(r'^(?P\d+)/debts', views.DebtsListView.as_view(), name='abon_debts'), - url(r'^(?P\d+)/pay', views.PayHistoryListView.as_view(), name='abon_phistory'), - - url(r'^(?P\d+)/addinvoice$', views.add_invoice, name='add_invoice'), - url(r'^(?P\d+)/pick$', views.pick_tariff, name='pick_tariff'), - url(r'^(?P\d+)/passport_view$', views.passport_view, name='passport_view'), - url(r'^(?P\d+)/chart$', views.charts, name='charts'), - url(r'^(?P\d+)/dials$', views.DialsListView.as_view(), name='dials'), - url(r'^(?P\d+)/reset_ip$', views.reset_ip, name='reset_ip'), - url(r'^(?P\d+)/extra_field$', views.make_extra_field, name='extra_field'), - url(r'^(?P\d+)/extra_field/(?P\d+)/delete$', views.extra_field_delete, name='extra_field_delete'), - url(r'^(?P\d+)/extra_field/edit$', views.extra_field_change, name='extra_field_edit'), - - url(r'^(?P\d+)/unsubscribe_service(?P\d+)$', views.unsubscribe_service, - name='unsubscribe_service'), - - url(r'^(?P\d+)/dev/$', views.dev, name='dev'), - url(r'^(?P\d+)/clear_dev/$', views.clear_dev, name='clear_dev'), - - url(r'^(?P\d+)/task_log$', views.TaskLogListView.as_view(), name='task_log'), - url(r'^(?P\d+)/user_dev$', views.save_user_dev_port, name='save_user_dev_port'), - - url(r'^(?P\d+)/tel$', views.tels, name='telephones'), - url(r'^(?P\d+)/tel/add$', views.tel_add, name='telephone_new'), - url(r'^(?P\d+)/tel/del$', views.tel_del, name='telephone_del'), - - url(r'^(?P\d+)/markers$', views.EditSibscriberMarkers.as_view(), name='markers_edit'), - - url(r'^(?P\d+)/periodic_pay$', views.add_edit_periodic_pay, name='add_periodic_pay'), - url(r'^(?P\d+)/periodic_pay(?P\d+)$', views.add_edit_periodic_pay, name='add_periodic_pay'), - url(r'^(?P\d+)/periodic_pay(?P\d+)/del$', views.del_periodic_pay, name='del_periodic_pay') -] diff --git a/abonapp/views.py b/abonapp/views.py index 17e08ed..9b7a710 100644 --- a/abonapp/views.py +++ b/abonapp/views.py @@ -116,7 +116,7 @@ def addabon(request, gid): assign_perm('abonapp.can_add_ballance', request.user, abon) abon.sync_with_nas(created=True) messages.success(request, _('create abon success msg')) - return redirect('abonapp:abon_home', group.id, abon.pk) + return redirect('abonapp:abon_home', group.id, abon.username) else: messages.error(request, _('fix form errors')) @@ -167,17 +167,17 @@ def del_abon(request): @login_required @permission_required('abonapp.can_add_ballance') @transaction.atomic -def abonamount(request, gid, uid): - abon = get_object_or_404(models.Abon, pk=uid) +def abonamount(request, gid, uname): + abon = get_object_or_404(models.Abon, username=uname) try: if request.method == 'POST': - abonid = mydefs.safe_int(request.POST.get('abonid')) - if abonid == int(uid): + abonuname = request.POST.get('abonuname') + if abonuname == uname: amnt = mydefs.safe_float(request.POST.get('amount')) abon.add_ballance(request.user, amnt, comment=_('fill account through admin side')) abon.save(update_fields=['ballance']) messages.success(request, _('Account filled successfully on %.2f') % amnt) - return redirect('abonapp:abon_phistory', gid=gid, uid=uid) + return redirect('abonapp:abon_phistory', gid=gid, uname=uname) else: messages.error(request, _('I not know the account id')) except (NasNetworkError, NasFailedResult) as e: @@ -198,7 +198,7 @@ class DebtsListView(BaseAbonListView): template_name = 'abonapp/invoiceForPayment.html' def get_queryset(self): - abon = get_object_or_404(models.Abon, pk=self.kwargs.get('uid')) + abon = get_object_or_404(models.Abon, username=self.kwargs.get('uname')) self.abon = abon return models.InvoiceForPayment.objects.filter(abon=abon) @@ -216,7 +216,7 @@ class PayHistoryListView(BaseAbonListView): template_name = 'abonapp/payHistory.html' def get_queryset(self): - abon = get_object_or_404(models.Abon, pk=self.kwargs.get('uid')) + abon = get_object_or_404(models.Abon, username=self.kwargs.get('uname')) self.abon = abon pay_history = models.AbonLog.objects.filter(abon=abon).order_by('-date') return pay_history @@ -230,15 +230,15 @@ class PayHistoryListView(BaseAbonListView): @login_required @mydefs.only_admins -def abon_services(request, gid, uid): +def abon_services(request, gid, uname): grp = get_object_or_404(Group, pk=gid) if not request.user.has_perm('group_app.can_view_group', grp): raise PermissionDenied - abon = get_object_or_404(models.Abon, pk=uid) + abon = get_object_or_404(models.Abon, username=uname) if abon.group != grp: messages.warning(request, _("User group id is not matches with group in url")) - return redirect('abonapp:abon_services', abon.group.id, abon.id) + return redirect('abonapp:abon_services', abon.group.id, abon.username) try: periodic_pay = models.PeriodicPayForId.objects.get(account=abon) @@ -256,8 +256,8 @@ def abon_services(request, gid, uid): @login_required @mydefs.only_admins -def abonhome(request, gid, uid): - abon = get_object_or_404(models.Abon, pk=uid) +def abonhome(request, gid, uname): + abon = get_object_or_404(models.Abon, username=uname) group = get_object_or_404(Group, pk=gid) if not request.user.has_perm('group_app.can_view_group', group): raise PermissionDenied @@ -325,9 +325,8 @@ def terminal_pay(request): @login_required @permission_required('abonapp.add_invoiceforpayment') -def add_invoice(request, gid, uid): - uid = mydefs.safe_int(uid) - abon = get_object_or_404(models.Abon, pk=uid) +def add_invoice(request, gid, uname): + abon = get_object_or_404(models.Abon, username=uname) grp = get_object_or_404(Group, pk=gid) try: @@ -346,7 +345,7 @@ def add_invoice(request, gid, uid): newinv.author = request.user newinv.save() messages.success(request, _('Receipt has been created')) - return redirect('abonapp:abon_home', gid=gid, uid=uid) + return redirect('abonapp:abon_home', gid=gid, username=uname) except (NasNetworkError, NasFailedResult) as e: messages.error(request, e) @@ -364,9 +363,9 @@ def add_invoice(request, gid, uid): @mydefs.only_admins @permission_required('abonapp.can_buy_tariff') @transaction.atomic -def pick_tariff(request, gid, uid): +def pick_tariff(request, gid, uname): grp = get_object_or_404(Group, pk=gid) - abon = get_object_or_404(models.Abon, pk=uid) + abon = get_object_or_404(models.Abon, username=uname) tariffs = Tariff.objects.get_tariffs_by_group(grp.pk) try: if request.method == 'POST': @@ -383,12 +382,12 @@ def pick_tariff(request, gid, uid): abon.pick_tariff(trf, request.user, deadline=deadline, comment=log_comment) abon.sync_with_nas(created=False) messages.success(request, _('Tariff has been picked')) - return redirect('abonapp:abon_services', gid=gid, uid=abon.id) + return redirect('abonapp:abon_services', gid=gid, uname=abon.username) except (mydefs.LogicError, NasFailedResult) as e: messages.error(request, e) except NasNetworkError as e: messages.error(request, e) - return redirect('abonapp:abon_services', gid=gid, uid=abon.id) + return redirect('abonapp:abon_services', gid=gid, uname=abon.username) except Tariff.DoesNotExist: messages.error(request, _('Tariff your picked does not exist')) except mydefs.MultipleException as errs: @@ -407,9 +406,9 @@ def pick_tariff(request, gid, uid): @login_required @permission_required('abonapp.delete_abontariff') -def unsubscribe_service(request, gid, uid, abon_tariff_id): +def unsubscribe_service(request, gid, uname, abon_tariff_id): try: - abon = get_object_or_404(models.Abon, pk=uid) + abon = get_object_or_404(models.Abon, username=uname) abon_tariff = get_object_or_404(models.AbonTariff, pk=int(abon_tariff_id)) abon.sync_with_nas(created=False) abon_tariff.delete() @@ -421,7 +420,7 @@ def unsubscribe_service(request, gid, uid, abon_tariff_id): except mydefs.MultipleException as errs: for err in errs.err_list: messages.error(request, err) - return redirect('abonapp:abon_services', gid=gid, uid=uid) + return redirect('abonapp:abon_services', gid=gid, uname=uname) @method_decorator(login_required, name='dispatch') @@ -453,7 +452,7 @@ class TaskLogListView(ListView): template_name = 'abonapp/task_log.html' def get_queryset(self): - abon = get_object_or_404(models.Abon, pk=self.kwargs.get('uid')) + abon = get_object_or_404(models.Abon, username=self.kwargs.get('uname')) self.abon = abon return Task.objects.filter(abon=abon) @@ -466,8 +465,8 @@ class TaskLogListView(ListView): @login_required @permission_required('abonapp.can_view_passport') -def passport_view(request, gid, uid): - abon = get_object_or_404(models.Abon, pk=uid) +def passport_view(request, gid, uname): + abon = get_object_or_404(models.Abon, username=uname) try: if request.method == 'POST': try: @@ -480,7 +479,7 @@ def passport_view(request, gid, uid): pi.abon = abon pi.save() messages.success(request, _('Passport information has been saved')) - return redirect('abonapp:passport_view', gid=gid, uid=uid) + return redirect('abonapp:passport_view', gid=gid, uname=uname) else: messages.error(request, _('fix form errors')) else: @@ -523,16 +522,16 @@ def chgroup_tariff(request, gid): @login_required @permission_required('abonapp.change_abon') -def dev(request, gid, uid): +def dev(request, gid, uname): abon_dev = None try: - abon = models.Abon.objects.get(pk=uid) + abon = models.Abon.objects.get(username=uname) if request.method == 'POST': dev = Device.objects.get(pk=request.POST.get('dev')) abon.device = dev abon.save(update_fields=['device']) messages.success(request, _('Device has successfully attached')) - return redirect('abonapp:abon_home', gid=gid, uid=uid) + return redirect('abonapp:abon_home', gid=gid, uname=uname) else: abon_dev = abon.device except Device.DoesNotExist: @@ -543,16 +542,16 @@ def dev(request, gid, uid): return render(request, 'abonapp/modal_dev.html', { 'devices': Device.objects.filter(group=gid), 'dev': abon_dev, - 'gid': gid, 'uid': uid + 'gid': gid, 'uname': uname }) @login_required @permission_required('abonapp.change_abon') @permission_required('group_app.can_view_group', (Group, 'pk', 'gid')) -def clear_dev(request, gid, uid): +def clear_dev(request, gid, uname): try: - abon = models.Abon.objects.get(pk=uid) + abon = models.Abon.objects.get(username=uname) abon.device = None abon.dev_port = None abon.save(update_fields=['device', 'dev_port']) @@ -560,12 +559,12 @@ def clear_dev(request, gid, uid): except models.Abon.DoesNotExist: messages.error(request, _('Abon does not exist')) return redirect('abonapp:people_list', gid=gid) - return redirect('abonapp:abon_home', gid=gid, uid=uid) + return redirect('abonapp:abon_home', gid=gid, uname=uname) @login_required @permission_required('group_app.can_view_group', (Group, 'pk', 'gid')) -def charts(request, gid, uid): +def charts(request, gid, uname): high = 100 wandate = request.GET.get('wantdate') @@ -576,7 +575,7 @@ def charts(request, gid, uid): try: StatElem = getModel(wandate) - abon = models.Abon.objects.get(pk=uid) + abon = models.Abon.objects.get(username=uname) if abon.group is None: abon.group = Group.objects.get(pk=gid) abon.save(update_fields=['group']) @@ -602,7 +601,7 @@ def charts(request, gid, uid): return redirect('abonapp:group_list') except ProgrammingError as e: messages.error(request, e) - return redirect('abonapp:abon_home', gid=gid, uid=uid) + return redirect('abonapp:abon_home', gid=gid, uname=uname) return render(request, 'abonapp/charts.html', { 'group': abon.group, @@ -615,8 +614,8 @@ def charts(request, gid, uid): @login_required @permission_required('abonapp.add_extrafieldsmodel') -def make_extra_field(request, gid, uid): - abon = get_object_or_404(models.Abon, pk=uid) +def make_extra_field(request, gid, uname): + abon = get_object_or_404(models.Abon, username=uname) try: if request.method == 'POST': frm = forms.ExtraFieldForm(request.POST) @@ -626,7 +625,7 @@ def make_extra_field(request, gid, uid): messages.success(request, _('Extra field successfully created')) else: messages.error(request, _('fix form errors')) - return redirect('abonapp:abon_home', gid=gid, uid=uid) + return redirect('abonapp:abon_home', gid=gid, username=uname) else: frm = forms.ExtraFieldForm() @@ -646,7 +645,7 @@ def make_extra_field(request, gid, uid): @login_required @permission_required('abonapp.change_extra_fields_model') -def extra_field_change(request, gid, uid): +def extra_field_change(request, gid, uname): extras = [(int(x), y) for x, y in zip(request.POST.getlist('ed'), request.POST.getlist('ex'))] try: for ex in extras: @@ -656,13 +655,13 @@ def extra_field_change(request, gid, uid): messages.success(request, _("Extra fields has been saved")) except models.ExtraFieldsModel.DoesNotExist: messages.error(request, _('One or more extra fields has not been saved')) - return redirect('abonapp:abon_home', gid=gid, uid=uid) + return redirect('abonapp:abon_home', gid=gid, username=uname) @login_required @permission_required('abonapp.delete_extra_fields_model') -def extra_field_delete(request, gid, uid, fid): - abon = get_object_or_404(models.Abon, pk=uid) +def extra_field_delete(request, gid, uname, fid): + abon = get_object_or_404(models.Abon, username=uname) try: extra_field = models.ExtraFieldsModel.objects.get(pk=fid) abon.extra_fields.remove(extra_field) @@ -670,7 +669,7 @@ def extra_field_delete(request, gid, uid, fid): messages.success(request, _('Extra field successfully deleted')) except models.ExtraFieldsModel.DoesNotExist: messages.warning(request, _('Extra field does not exist')) - return redirect('abonapp:abon_home', gid=gid, uid=uid) + return redirect('abonapp:abon_home', gid=gid, uname=uname) @login_required @@ -723,7 +722,7 @@ class DialsListView(BaseAbonListView): template_name = 'abonapp/dial_log.html' def get_queryset(self): - abon = get_object_or_404(models.Abon, pk=self.kwargs.get('uid')) + abon = get_object_or_404(models.Abon, username=self.kwargs.get('uname')) if not self.request.user.has_perm('group_app.can_view_group', abon.group): raise PermissionDenied self.abon = abon @@ -744,7 +743,7 @@ class DialsListView(BaseAbonListView): def render_to_response(self, context, **response_kwargs): if hasattr(self.abon.group, 'pk') and self.abon.group.pk != int(self.kwargs.get('gid')): - return redirect('abonapp:dials', self.abon.group.pk, self.abon.pk) + return redirect('abonapp:dials', self.abon.group.pk, self.abon.username) return super(DialsListView, self).render_to_response(context, **response_kwargs) def get(self, request, *args, **kwargs): @@ -754,19 +753,19 @@ class DialsListView(BaseAbonListView): messages.error(request, e) return redirect('abonapp:abon_home', self.kwargs.get('gid'), - self.kwargs.get('uid')) + self.kwargs.get('uname')) @login_required @permission_required('abonapp.change_abon') -def save_user_dev_port(request, gid, uid): +def save_user_dev_port(request, gid, uname): if request.method != 'POST': messages.error(request, _('Method is not POST')) - return redirect('abonapp:abon_home', gid, uid) + return redirect('abonapp:abon_home', gid, uname) user_port = mydefs.safe_int(request.POST.get('user_port')) is_dynamic_ip = request.POST.get('is_dynamic_ip') try: - abon = models.Abon.objects.get(pk=uid) + abon = models.Abon.objects.get(username=uname) if user_port == 0: port = None else: @@ -775,13 +774,13 @@ def save_user_dev_port(request, gid, uid): try: other_abon = models.Abon.objects.get(device=abon.device, dev_port=port) if other_abon != abon: - user_url = resolve_url('abonapp:abon_home', other_abon.group.id, other_abon.id) + user_url = resolve_url('abonapp:abon_home', other_abon.group.id, other_abon.username) 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) + return redirect('abonapp:abon_home', gid, uname) except models.Abon.DoesNotExist: pass except models.Abon.MultipleObjectsReturned: @@ -802,7 +801,7 @@ def save_user_dev_port(request, gid, uid): messages.error(request, _('Selected port does not exist')) except models.Abon.DoesNotExist: messages.error(request, _('User does not exist')) - return redirect('abonapp:abon_home', gid, uid) + return redirect('abonapp:abon_home', gid, uname) @login_required @@ -865,28 +864,28 @@ def street_del(request, gid, sid): @login_required @permission_required('abonapp.can_view_additionaltelephones') @permission_required('group_app.can_view_group', (Group, 'pk', 'gid')) -def tels(request, gid, uid): - abon = get_object_or_404(models.Abon, pk=uid) +def tels(request, gid, uname): + abon = get_object_or_404(models.Abon, username=uname) telephones = abon.additional_telephones.all() return render_to_text('abonapp/modal_additional_telephones.html', { 'telephones': telephones, 'gid': gid, - 'uid': uid + 'uname': uname }, request=request) @login_required @permission_required('abnapp.add_additionaltelephone') -def tel_add(request, gid, uid): +def tel_add(request, gid, uname): if request.method == 'POST': frm = forms.AdditionalTelephoneForm(request.POST) if frm.is_valid(): new_tel = frm.save(commit=False) - abon = get_object_or_404(models.Abon, pk=uid) + abon = get_object_or_404(models.Abon, username=uname) new_tel.abon = abon new_tel.save() messages.success(request, _('New telephone has been saved')) - return redirect('abonapp:abon_home', gid, uid) + return redirect('abonapp:abon_home', gid, uname) else: messages.error(request, _('fix form errors')) else: @@ -894,13 +893,13 @@ def tel_add(request, gid, uid): return render_to_text('abonapp/modal_add_phone.html', { 'form': frm, 'gid': gid, - 'uid': uid + 'uname': uname }, request=request) @login_required @permission_required('abnapp.delete_additionaltelephone') -def tel_del(request, gid, uid): +def tel_del(request, gid, uname): try: tid = mydefs.safe_int(request.GET.get('tid')) tel = models.AdditionalTelephone.objects.get(pk=tid) @@ -908,7 +907,7 @@ def tel_del(request, gid, uid): messages.success(request, _('Additional telephone successfully deleted')) except models.AdditionalTelephone.DoesNotExist: messages.error(request, _('Telephone not found')) - return redirect('abonapp:abon_home', gid, uid) + return redirect('abonapp:abon_home', gid, uname) @login_required @@ -971,8 +970,8 @@ def abon_export(request, gid): @login_required @permission_required('abonapp.change_abon') @permission_required('group_app.can_view_group', (Group, 'pk', 'gid')) -def reset_ip(request, gid, uid): - abon = get_object_or_404(models.Abon, pk=uid) +def reset_ip(request, gid, uname): + abon = get_object_or_404(models.Abon, username=uname) abon.ip_address = None abon.save(update_fields=['ip_address']) return HttpResponse(dumps({ @@ -1001,7 +1000,7 @@ def fin_report(request): @login_required @permission_required('group_app.can_view_group', (Group, 'pk', 'gid')) -def add_edit_periodic_pay(request, gid, uid, periodic_pay_id=0): +def add_edit_periodic_pay(request, gid, uname, periodic_pay_id=0): if periodic_pay_id == 0: if not request.user.has_perm('abonapp.add_periodicpayforid'): raise PermissionDenied @@ -1013,33 +1012,33 @@ def add_edit_periodic_pay(request, gid, uid, periodic_pay_id=0): if request.method == 'POST': frm = forms.PeriodicPayForIdForm(request.POST, instance=periodic_pay_instance) if frm.is_valid(): - abon = get_object_or_404(models.Abon, pk=uid) + abon = get_object_or_404(models.Abon, username=uname) inst = frm.save(commit=False) inst.account = abon inst.save() messages.success(request, _('Periodic pays has been designated')) else: messages.error(request, _('Something wrong in form')) - return redirect('abonapp:abon_services', gid, uid) + return redirect('abonapp:abon_services', gid, uname) else: frm = forms.PeriodicPayForIdForm(instance=periodic_pay_instance) return render_to_text('abonapp/modal_periodic_pay.html', { 'form': frm, 'gid': gid, - 'uid': uid + 'uname': uname }, request=request) @login_required @permission_required('group_app.can_view_group', (Group, 'pk', 'gid')) @permission_required('abonapp.delete_periodicpayforid') -def del_periodic_pay(request, gid, uid, periodic_pay_id): +def del_periodic_pay(request, gid, uname, periodic_pay_id): periodic_pay_instance = get_object_or_404(models.PeriodicPayForId, pk=periodic_pay_id) - if periodic_pay_instance.account.id != uid: - uid = periodic_pay_instance.account.id + if periodic_pay_instance.account.username != uname: + uname = periodic_pay_instance.account.username periodic_pay_instance.delete() messages.success(request, _('Periodic pay successfully deleted')) - return redirect('abonapp:abon_services', gid, uid) + return redirect('abonapp:abon_services', gid, uname) @method_decorator([login_required, mydefs.only_admins], name='dispatch') @@ -1049,16 +1048,16 @@ class EditSibscriberMarkers(UpdateView): form_class = forms.MarkersForm def get_object(self, queryset=None): - obj = models.Abon.objects.get(pk=self.kwargs.get('uid')) + obj = models.Abon.objects.get(username=self.kwargs.get('uname')) return obj def get_success_url(self): - return resolve_url('abonapp:abon_home', self.kwargs.get('gid'), self.kwargs.get('uid')) + return resolve_url('abonapp:abon_home', self.kwargs.get('gid'), self.kwargs.get('uname')) def get_context_data(self, **kwargs): context = super(EditSibscriberMarkers, self).get_context_data(**kwargs) context['gid'] = self.kwargs.get('gid') - context['uid'] = self.kwargs.get('uid') + context['uname'] = self.kwargs.get('uname') return context def form_invalid(self, form): diff --git a/accounts_app/models.py b/accounts_app/models.py index 4b37f31..7219b96 100644 --- a/accounts_app/models.py +++ b/accounts_app/models.py @@ -47,7 +47,12 @@ class MyUserManager(BaseUserManager): class BaseAccount(AbstractBaseUser, PermissionsMixin): - username = models.CharField(_('profile username'), max_length=127, unique=True) + username = models.CharField( + _('profile username'), + max_length=127, + unique=True, + validators=[RegexValidator(r'^\w{1,127}$')] + ) fio = models.CharField(_('fio'), max_length=256) birth_day = models.DateField(_('birth day'), auto_now_add=True) is_active = models.BooleanField(_('Is active'), default=True) diff --git a/devapp/templates/devapp/custom_dev_page/onu.html b/devapp/templates/devapp/custom_dev_page/onu.html index 03089a8..8f20206 100644 --- a/devapp/templates/devapp/custom_dev_page/onu.html +++ b/devapp/templates/devapp/custom_dev_page/onu.html @@ -21,7 +21,7 @@ {% for da in dev_accs %}
  • {% trans 'Attached user' %}: {% if da.group %} - {{ da.get_full_name }} {% else %} {{ da.get_full_name }} diff --git a/devapp/templates/devapp/manage_ports/fix_abon_device.html b/devapp/templates/devapp/manage_ports/fix_abon_device.html index a0a6902..84c78ad 100644 --- a/devapp/templates/devapp/manage_ports/fix_abon_device.html +++ b/devapp/templates/devapp/manage_ports/fix_abon_device.html @@ -26,7 +26,7 @@
    • {% for abon in abons %} - {{ abon.get_full_name }} + {{ abon.get_full_name }} {% empty %} {% trans 'Abons not found' %} {% endfor %} diff --git a/devapp/templates/devapp/manage_ports/modal_show_subscriber_on_port.html b/devapp/templates/devapp/manage_ports/modal_show_subscriber_on_port.html index eb8c6d2..2806bf3 100644 --- a/devapp/templates/devapp/manage_ports/modal_show_subscriber_on_port.html +++ b/devapp/templates/devapp/manage_ports/modal_show_subscriber_on_port.html @@ -6,7 +6,7 @@
    - + {{ object.get_full_name }}
    diff --git a/dialing_app/views.py b/dialing_app/views.py index 56410d4..eb1c37a 100644 --- a/dialing_app/views.py +++ b/dialing_app/views.py @@ -54,7 +54,7 @@ def to_abon(request, tel): return redirect('dialapp:home') abon = abon[0] if abon.group: - return redirect('abonapp:abon_home', gid=abon.group.pk, uid=abon.pk) + return redirect('abonapp:abon_home', gid=abon.group.pk, uname=abon.username) else: return redirect('abonapp:group_list') diff --git a/searchapp/templates/searchapp/index.html b/searchapp/templates/searchapp/index.html index 8fc7ba4..e0d1f31 100644 --- a/searchapp/templates/searchapp/index.html +++ b/searchapp/templates/searchapp/index.html @@ -22,7 +22,7 @@
    {% for ab in abons %} - +

    {{ ab.username|safe }}

    diff --git a/taskapp/templates/taskapp/details.html b/taskapp/templates/taskapp/details.html index 0fd0773..a70ab55 100644 --- a/taskapp/templates/taskapp/details.html +++ b/taskapp/templates/taskapp/details.html @@ -28,7 +28,7 @@ {% trans 'Condition' %}: {{ task.get_state_display }}
    {% trans 'Subscriber' %} {% if task.abon %} -     {{ task.abon.get_full_name }} + {{ task.abon.get_full_name }} {% else %} {% trans 'Not assigned' %} {% endif %}
    diff --git a/taskapp/templates/taskapp/tasklist.html b/taskapp/templates/taskapp/tasklist.html index 60c0138..26db009 100644 --- a/taskapp/templates/taskapp/tasklist.html +++ b/taskapp/templates/taskapp/tasklist.html @@ -37,7 +37,7 @@ {% endif %} {% endif %} - + {{ task.abon.get_full_name }} {% if task.comment_count > 0 %}({{ task.comment_count }}){% endif %} diff --git a/taskapp/templates/taskapp/tasklist_all.html b/taskapp/templates/taskapp/tasklist_all.html index 7b9d5f8..d018e53 100644 --- a/taskapp/templates/taskapp/tasklist_all.html +++ b/taskapp/templates/taskapp/tasklist_all.html @@ -50,7 +50,7 @@ {% endif %} {% endif %} - + {{ task.abon.get_full_name }} {% if task.comment_count > 0 %}({{ task.comment_count }}){% endif %} diff --git a/taskapp/templates/taskapp/tasklist_failed.html b/taskapp/templates/taskapp/tasklist_failed.html index 64ff05b..004747d 100644 --- a/taskapp/templates/taskapp/tasklist_failed.html +++ b/taskapp/templates/taskapp/tasklist_failed.html @@ -37,7 +37,7 @@ {{ task.pk }} {% if task.abon and task.abon.group %} - {{ task.abon.get_full_name }} + {{ task.abon.get_full_name }} {{ task.abon.group.title }}, {{ task.abon.street|default:_('Not assigned') }} {{ task.abon.house|default:_('Not assigned') }} {% else %} {% trans 'User does not exist' %} diff --git a/taskapp/templates/taskapp/tasklist_finish.html b/taskapp/templates/taskapp/tasklist_finish.html index 68878ec..b0a6be0 100644 --- a/taskapp/templates/taskapp/tasklist_finish.html +++ b/taskapp/templates/taskapp/tasklist_finish.html @@ -37,7 +37,7 @@ {% if task.abon and task.abon.group %} - + {{ task.abon.get_full_name }} diff --git a/taskapp/templates/taskapp/tasklist_own.html b/taskapp/templates/taskapp/tasklist_own.html index b4bc996..8460aac 100644 --- a/taskapp/templates/taskapp/tasklist_own.html +++ b/taskapp/templates/taskapp/tasklist_own.html @@ -38,7 +38,7 @@ {% if task.abon and task.abon.group %} - + {{ task.abon.get_full_name }}