diff --git a/freeradius_utils/auth.py b/freeradius_utils/auth.py index 823d0d58..17b9513d 100644 --- a/freeradius_utils/auth.py +++ b/freeradius_utils/auth.py @@ -301,7 +301,7 @@ def decide_vlan_and_register_switch(nas, nas_type, port_number, mac_address): sw_name = str(nas) - port = Port.objects.filter(switch=Switch.objects.filter(switch_interface=nas), port=port_number).first() + port = Port.objects.filter(switch=Switch.objects.filter(interface_ptr=nas), port=port_number).first() #Si le port est inconnu, on place sur le vlan defaut if not port: return (sw_name, "Chambre inconnue", u'Port inconnu', VLAN_OK) diff --git a/logs/views.py b/logs/views.py index f40ca3fc..b3af50e9 100644 --- a/logs/views.py +++ b/logs/views.py @@ -459,14 +459,5 @@ def stats_droits(request): for droit in ListRight.objects.all().select_related('group_ptr'):#.prefetch_related('group_ptr__user_set__revision_set'): stats_list[droit]=droit.user_set.all().annotate(num=Count('revision'),last=Max('revision__date_created')) - - # count,last=0,0 - # for droit in ListRight.objects.all(): - # for use in droit.user_set.all(): - # countRevision.objects.filter(user=use).count() - # print(Revision.objects.order_by('date_created').last().date_created) - # stats_list[droit]=use.annotate(num=count,las) - - #raise ValueError('temps='+str(time()-depart)) return render(request, 'logs/stats_droits.html', {'stats_list': stats_list})