fix

abonapp/locale/ru/LC_MESSAGES/django.po

@@ -95,13 +95,9 @@ msgstr "Поля"
 msgid "Amount of money"
 msgstr "Количество денег"
 
-#: models.py:34
-msgid "Can view subscriber logs"
-msgstr "Может видеть логи абонента"
-
 #: models.py:66
 msgid "finish service perm"
-msgstr "Снятие со счёта средств"
+msgstr "Завершение услуги"
 
 #: models.py:68
 msgid "Abon service"
@@ -232,10 +228,6 @@ msgstr "Кем выдан"
 msgid "Passport Info"
 msgstr "Паспортные данные"
 
-#: models.py:335
-msgid "Can view invoice for payment"
-msgstr "Может видеть назначенные платежи"
-
 #: models.py:337
 msgid "Debt"
 msgstr "Квитанция (долг)"
@@ -253,10 +245,6 @@ msgstr "Терминал"
 msgid "Receipt number"
 msgstr "Номер пас."
 
-#: models.py:420
-msgid "Can view additional telephones"
-msgstr "Может видеть дополнительные телефоны"
-
 #: models.py:422
 msgid "Additional telephone"
 msgstr "Дополнительный телефон"

abonapp/models.py

@@ -30,9 +30,6 @@ class AbonLog(models.Model):
 
     class Meta:
         db_table = 'abonent_log'
-        permissions = (
-            ('can_view_abonlog', _('Can view subscriber logs')),
-        )
         ordering = '-date',
 
     def __str__(self):
@@ -330,9 +327,6 @@ class InvoiceForPayment(models.Model):
     class Meta:
         ordering = ('date_create',)
         db_table = 'abonent_inv_pay'
-        permissions = (
-            ('can_view_invoiceforpayment', _('Can view invoice for payment')),
-        )
         verbose_name = _('Debt')
         verbose_name_plural = _('Debts')
 
@@ -415,9 +409,6 @@ class AdditionalTelephone(models.Model):
     class Meta:
         db_table = 'additional_telephones'
         ordering = ('owner_name',)
-        permissions = (
-            ('can_view_additionaltelephones', _('Can view additional telephones')),
-        )
         verbose_name = _('Additional telephone')
         verbose_name_plural = _('Additional telephones')
 

abonapp/templates/abonapp/editAbon.html

@@ -84,7 +84,7 @@
                                     </a>
                                 {% endif %}
 
-                                {% if perms.dialing_app.can_send_sms %}
+                                {% if perms.dialing_app.add_smsout %}
                                     <a href="{% url 'dialapp:send_sms' %}?path={{ request.path|urlencode }}&dst={{ form.telephone.value|urlencode }}" class="btn btn-default btn-modal">
                                         <span class="glyphicon glyphicon-envelope"></span> {% trans 'Send sms' %}
                                     </a>

abonapp/templates/abonapp/group_list.html

@@ -55,12 +55,12 @@
             <tfoot>
             <tr>
                 <td colspan="4" class="btn-group btn-group-sm">
-                    {% if perms.abonapp.can_view_abonlog %}
+                    {% if perms.abonapp.view_abonlog %}
                         <a href="{% url 'abonapp:log' %}" class="btn btn-default">
                             <span class="glyphicon glyphicon-record"></span> <span class="hidden-xs">{% trans 'Subscribers actions' %}</span>
                         </a>
                     {% endif %}
-                    {% if perms.abonapp.can_view_invoiceforpayment %}
+                    {% if perms.abonapp.view_invoiceforpayment %}
                         <a href="{% url 'abonapp:debtors' %}" class="btn btn-default">
                             <span class="glyphicon glyphicon-exclamation-sign"></span> <span class="hidden-xs">{% trans 'List of debtors' %}</span>
                         </a>

abonapp/templates/abonapp/service.html

@@ -55,9 +55,15 @@
                     {% endif %}
 
                     {% if abon_tariff %}
-                        <a href="{% url 'abonapp:unsubscribe_service' group.pk abon.username abon_tariff.pk %}" class="btn btn-sm btn-danger">
-                            <span class="glyphicon glyphicon-remove-circle"></span> {% trans 'Finish service' %}
-                        </a>
+                        {% if perms.abonapp.can_complete_service %}
+                            <a href="{% url 'abonapp:unsubscribe_service' group.pk abon.username abon_tariff.pk %}" class="btn btn-sm btn-danger">
+                                <span class="glyphicon glyphicon-remove-circle"></span> {% trans 'Finish service' %}
+                            </a>
+                        {% else %}
+                            <a href="#" class="btn btn-sm btn-danger disabled">
+                                <span class="glyphicon glyphicon-remove-circle"></span> {% trans 'Finish service' %}
+                            </a>
+                        {% endif %}
                     {% endif %}
                 </div>
             </div>
@@ -115,7 +121,7 @@
             </div>
         </div>
 
-        {% if perms.tariff_app.can_view_periodic_pay %}
+        {% if perms.tariff_app.view_periodic_pay %}
         <div class="col-sm-6">
             <div class="panel panel-default">
                 <div class="panel-heading">

abonapp/views.py

@@ -456,7 +456,7 @@ def pick_tariff(request, gid: int, uname):
 
 @login_required
 @lib.decorators.only_admins
-@permission_required('abonapp.delete_abontariff')
+@permission_required('abonapp.can_complete_service')
 def unsubscribe_service(request, gid: int, uname, abon_tariff_id: int):
     try:
         abon_tariff = get_object_or_404(models.AbonTariff, pk=int(abon_tariff_id))
@@ -473,7 +473,7 @@ def unsubscribe_service(request, gid: int, uname, abon_tariff_id: int):
 
 
 @method_decorator(login_decs, name='dispatch')
-@method_decorator(permission_required('abonapp.can_view_abonlog'), name='dispatch')
+@method_decorator(permission_required('abonapp.view_abonlog'), name='dispatch')
 class LogListView(ListView):
     paginate_by = getattr(settings, 'PAGINATION_ITEMS_PER_PAGE', 10)
     http_method_names = ('get',)
@@ -483,7 +483,7 @@ class LogListView(ListView):
 
 
 @method_decorator(login_decs, name='dispatch')
-@method_decorator(permission_required('abonapp.can_view_invoiceforpayment'), name='dispatch')
+@method_decorator(permission_required('abonapp.view_invoiceforpayment'), name='dispatch')
 class DebtorsListView(ListView):
     paginate_by = getattr(settings, 'PAGINATION_ITEMS_PER_PAGE', 10)
     http_method_names = ('get',)
@@ -923,7 +923,7 @@ def active_nets(request, gid):
 
 @login_required
 @lib.decorators.only_admins
-@permission_required('abonapp.can_view_additionaltelephones')
+@permission_required('abonapp.view_additionaltelephones')
 @permission_required('group_app.view_group', (Group, 'pk', 'gid'))
 def tels(request, gid: int, uname):
     abon = get_object_or_404(models.Abon, username=uname)

accounts_app/locale/ru/LC_MESSAGES/django.po

@@ -382,3 +382,6 @@ msgstr "Учётная запись"
 
 msgid "Action log"
 msgstr "Лог действий"
+
+msgid "Administrator"
+msgstr "Сотрудник"

dialing_app/locale/ru/LC_MESSAGES/django.po

@@ -39,10 +39,6 @@ msgstr "Отвечен"
 msgid "Unknown"
 msgstr "Не определён"
 
-#: models.py:84 models.py:108
-msgid "Can view sms"
-msgstr "Может просматривать смс"
-
 #: models.py:86 models.py:87
 msgid "SMS"
 msgstr "СМС"
@@ -71,10 +67,6 @@ msgstr "Отправленное"
 msgid "Status"
 msgstr "Статус"
 
-#: models.py:109
-msgid "Can send sms"
-msgstr "Может отправлять смс"
-
 #: models.py:111 models.py:112
 msgid "Out SMS"
 msgstr "Исходящие СМС"

dialing_app/models.py

@@ -80,9 +80,6 @@ class SMSModel(models.Model):
 
     class Meta:
         db_table = 'sms'
-        permissions = (
-            ('can_view_sms', _('Can view sms')),
-        )
         verbose_name = _('SMS')
         verbose_name_plural = _('SMS')
         ordering = ('-when',)
@@ -104,10 +101,6 @@ class SMSOut(models.Model):
 
     class Meta:
         db_table = 'out_sms'
-        permissions = (
-            ('can_view_sms', _('Can view sms')),
-            ('can_send_sms', _('Can send sms'))
-        )
         verbose_name = _('Out SMS')
         verbose_name_plural = _('Out SMS')
         ordering = ('-when',)

dialing_app/templates/inbox_sms.html

@@ -26,7 +26,7 @@
 
         </div>
         <div class="panel-footer">
-            {% if perms.dialing_app.can_send_sms %}
+            {% if perms.dialing_app.add_smsout %}
                 <a href="{% url 'dialapp:send_sms' %}" class="btn btn-default btn-modal">
                     <span class="glyphicon glyphicon-envelope"></span> {% trans 'Send sms' %}
                 </a>

dialing_app/views.py

@@ -124,7 +124,7 @@ class DialsFilterListView(BaseListView):
 
 
 @method_decorator(login_decs, name='dispatch')
-@method_decorator(permission_required('dialing_app.can_view_sms'), name='dispatch')
+@method_decorator(permission_required('dialing_app.view_smsmodel'), name='dispatch')
 class InboxSMSListView(BaseListView):
     template_name = 'inbox_sms.html'
     context_object_name = 'sms_messages'
@@ -133,7 +133,7 @@ class InboxSMSListView(BaseListView):
 
 @login_required
 @only_admins
-@permission_required('dialing_app.can_send_sms')
+@permission_required('dialing_app.add_smsout')
 def send_sms(request):
     path = request.GET.get('path')
     initial_dst = request.GET.get('dst')

mapapp/locale/ru/LC_MESSAGES/django.po

@@ -44,10 +44,6 @@ msgstr "Геоточка"
 msgid "Map points"
 msgstr "Геоточки"
 
-#: mapapp/models.py:18
-msgid "Can view"
-msgstr "Может просматривать"
-
 #: mapapp/templates/maps/add_device.html:8 mapapp/templates/maps/dot.html:9
 #: mapapp/templates/maps/options.html:7
 msgid "Map settings"

mapapp/models.py

@@ -15,9 +15,6 @@ class Dot(models.Model):
         verbose_name = _('Map point')
         verbose_name_plural = _('Map points')
         ordering = ('title',)
-        permissions = (
-            ('can_view', _('Can view')),
-        )
 
     def __str__(self):
         return self.title

nas_app/locale/ru/LC_MESSAGES/django.po

@@ -56,10 +56,6 @@ msgstr "Сервер доступа в интернет(NAS, Шлюз)"
 msgid "Network access servers. Gateways"
 msgstr "Серверы доступа в интернет"
 
-#: models.py:53
-msgid "Can view NAS"
-msgstr "Может видеть NAS"
-
 #: models.py:63 tests.py:194
 msgid "You cannot remove default server"
 msgstr "Вы не можете удалить шлюз по умолчанию"

nas_app/models.py

@@ -48,9 +48,6 @@ class NASModel(models.Model):
         verbose_name = _('Network access server. Gateway')
         verbose_name_plural = _('Network access servers. Gateways')
         ordering = 'ip_address',
-        permissions = (
-            ('can_view_nas', _('Can view NAS')),
-        )
 
 
 @receiver(pre_delete, sender=NASModel)

nas_app/views.py

@@ -34,7 +34,8 @@ class NasCreateView(CreateView):
     def form_valid(self, form):
         r = super(NasCreateView, self).form_valid(form)
         assign_perm("nas_app.change_nasmodel", self.request.user, self.object)
-        assign_perm("nas_app.can_view_nas", self.request.user, self.object)
+        assign_perm("nas_app.view_nas", self.request.user, self.object)
+        assign_perm("nas_app.delete_nas", self.request.user, self.object)
         self.request.user.log(self.request.META, 'cnas', '"%(title)s", %(ip)s, %(type)s' % {
             'title': self.object.title,
             'ip': self.object.ip_address,

tariff_app/locale/ru/LC_MESSAGES/django.po

@@ -93,10 +93,6 @@ msgstr "Алгоритм расчёта"
 msgid "Total amount"
 msgstr "Стоимость"
 
-#: models.py:104
-msgid "Can view periodic pay"
-msgstr "Может смотреть периодические платежи"
-
 #: models.py:106
 msgid "Periodic pay"
 msgstr "Периодический платёж"

tariff_app/models.py

@@ -100,9 +100,6 @@ class PeriodicPay(models.Model):
 
     class Meta:
         db_table = 'periodic_pay'
-        permissions = (
-            ('can_view_periodic_pay', _('Can view periodic pay')),
-        )
         verbose_name = _('Periodic pay')
         verbose_name_plural = _('Periodic pays')
         ordering = ('-id',)

tariff_app/templates/tariff_app/periodic_pays/list.html

@@ -15,7 +15,7 @@
             </thead>
             <tbody>
             {% trans 'Edit' as edtext %}
-            {% with can_view=perms.tariff_app.can_view_periodic_pay %}
+            {% with can_view=perms.tariff_app.view_periodic_pay %}
             {% for pay in pays %}
             <tr>
                 <td>{{ pay.name }}</td>