Merge branch 'global_group_update' into devel

abonapp/models.py

@@ -191,7 +191,7 @@ class Abon(BaseAccount):
         AbonLog.objects.create(
             abon=self,
             amount=amount,
-            author=current_user,
+            author=current_user if isinstance(current_user, UserProfile) else None,
             comment=comment
         )
         self.ballance += amount

abonapp/pay_systems.py

@@ -67,8 +67,7 @@ def allpay(request):
             if pays.count() > 0:
                 return bad_ret(-100)
 
-            # тут в author передаём учётку абонента, т.к. это он сам через терминал пополняет
-            abon.add_ballance(abon, pay_amount, comment='AllPay %.2f' % pay_amount)
+            abon.add_ballance(None, pay_amount, comment='AllPay %.2f' % pay_amount)
             abon.save(update_fields=['ballance'])
 
             AllTimePayLog.objects.create(

abonapp/views.py

@@ -32,12 +32,12 @@ from djing.global_base_views import OrderingMixin, BaseListWithFiltering
 PAGINATION_ITEMS_PER_PAGE = getattr(settings, 'PAGINATION_ITEMS_PER_PAGE', 10)
 
 
-@method_decorator([login_required, mydefs.only_admins], name='dispatch')
 class BaseAbonListView(OrderingMixin, BaseListWithFiltering):
     paginate_by = PAGINATION_ITEMS_PER_PAGE
     http_method_names = ['get']
 
 
+@method_decorator([login_required, mydefs.only_admins], name='dispatch')
 class PeoplesListView(BaseAbonListView):
     context_object_name = 'peoples'
     template_name = 'abonapp/peoples.html'
@@ -83,6 +83,7 @@ class PeoplesListView(BaseAbonListView):
         return context
 
 
+@method_decorator([login_required, mydefs.only_admins], name='dispatch')
 class GroupListView(BaseAbonListView):
     context_object_name = 'groups'
     template_name = 'abonapp/group_list.html'
@@ -190,6 +191,7 @@ def abonamount(request, gid, uid):
     }, request=request)
 
 
+@method_decorator([login_required, mydefs.only_admins], name='dispatch')
 @method_decorator(permission_required('group_app.can_view_group', (Group, 'pk', 'gid')), name='dispatch')
 class DebtsListView(BaseAbonListView):
     context_object_name = 'invoices'
@@ -207,6 +209,7 @@ class DebtsListView(BaseAbonListView):
         return context
 
 
+@method_decorator([login_required, mydefs.only_admins], name='dispatch')
 @method_decorator(permission_required('group_app.can_view_group', (Group, 'pk', 'gid')), name='dispatch')
 class PayHistoryListView(BaseAbonListView):
     context_object_name = 'pay_history'
@@ -215,7 +218,7 @@ class PayHistoryListView(BaseAbonListView):
     def get_queryset(self):
         abon = get_object_or_404(models.Abon, pk=self.kwargs.get('uid'))
         self.abon = abon
-        pay_history = models.AbonLog.objects.filter(abon=abon).order_by('-id')
+        pay_history = models.AbonLog.objects.filter(abon=abon).order_by('-date')
         return pay_history
 
     def get_context_data(self, **kwargs):
@@ -715,6 +718,7 @@ def abon_ping(request):
     }))
 
 
+@method_decorator([login_required, mydefs.only_admins], name='dispatch')
 class DialsListView(BaseAbonListView):
     context_object_name = 'logs'
     template_name = 'abonapp/dial_log.html'

agent/netflow/netflow_handler.py

@@ -36,7 +36,7 @@ if __name__ == '__main__':
 
     sql = r'SELECT abonent.ip_address, acc.username ' \
           r'FROM abonent ' \
-          r'LEFT JOIN accounts_app_userprofile AS acc ON (acc.id = abonent.userprofile_ptr_id) ' \
+          r'LEFT JOIN base_accounts AS acc ON (acc.id = abonent.baseaccount_ptr_id) ' \
           r'WHERE abonent.ip_address != 0'
     ln = cursor.execute(sql)
     with open(tmp_ipuser_file, 'w') as f:

devapp/models.py

@@ -107,7 +107,7 @@ class Device(models.Model):
     def update_dhcp(self):
         if self.devtype not in ('On','Dl'):
             return
-        raise ProgrammingError('переделать это безобразие')
+        #raise ProgrammingError('переделать это безобразие')
         # FIXME: переделать это безобразие
         grp = self.user_group.id
         code = ''

djing/settings.py

@@ -166,7 +166,7 @@ AUTH_USER_MODEL = 'accounts_app.UserProfile'
 
 LOGIN_URL = reverse_lazy('acc_app:login')
 LOGIN_REDIRECT_URL = reverse_lazy('acc_app:profile')
-LOGOUT_URL = reverse_lazy('acc_app:logout_link')
+LOGOUT_URL = reverse_lazy('acc_app:logout')
 
 PAGINATION_ITEMS_PER_PAGE = local_settings.PAGINATION_ITEMS_PER_PAGE
 

photo_app/models.py

@@ -42,7 +42,7 @@ class Photo(models.Model):
             os.makedirs(path + '/min')
         im.save(fname)
         os.remove(self.image.path)
-        self.image = "%s.%s" % (hs, ext)
+        self.image = "media/%s.%s" % (hs, ext)
         super(Photo, self).save(*args, **kwargs)
 
         # class Meta:

static/clientside/custom.css

@@ -20,15 +20,3 @@ img.navbar-brand {
 .modal-header.success {background-color: #6ad245;}
 .modal-header.primary {background-color: #789cbb;}
 
-
-
-html{height: 100%;}
-body{
-    padding: 88px 15px 0;
-    background-image: url(../img/Transparent_snowman_PNG.png);
-    background-repeat: no-repeat;
-    background-position: bottom left;
-    background-attachment: fixed;
-}
-
-