mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-10-31 23:22:49 +00:00
Merge branch 'typos_and_fix_radius' into 'dev'
Fix des erreurs, et améliore la lisibilité des logs See merge request federez/re2o!236
This commit is contained in:
commit
a3ebf34601
3 changed files with 3 additions and 3 deletions
|
@ -348,7 +348,7 @@ def decide_vlan_and_register_switch(nas_machine, nas_type, port_number,
|
|||
if not nas_machine:
|
||||
return ('?', u'Chambre inconnue', u'Nas inconnu', VLAN_OK)
|
||||
|
||||
sw_name = str(nas_machine)
|
||||
sw_name = str(getattr(nas_machine, 'short_name', str(nas_machine)))
|
||||
|
||||
port = (Port.objects
|
||||
.filter(
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
python re2o {
|
||||
module = auth
|
||||
|
||||
python_path = /etc/freeradius/3.0:/usr/lib/python2.7/:/usr/lib/python2.7/dist-packages/:/usr/local/lib/python2.7/site-packages/:/usr/local/lib/python2.7/dist-packages/
|
||||
python_path = /etc/freeradius/3.0:/usr/lib/python2.7:/usr/lib/python2.7/dist-packages:/usr/local/lib/python2.7/site-packages:/usr/lib/python2.7/lib-dynload:/usr/local/lib/python2.7/dist-packages
|
||||
|
||||
mod_instantiate = ${.module}
|
||||
func_instantiate = instantiate
|
||||
|
|
|
@ -427,7 +427,7 @@ class Port(AclMixin, RevMixin, models.Model):
|
|||
:returns: the profile of self (port)"""
|
||||
def profile_or_nothing(profile):
|
||||
port_profile = PortProfile.objects.filter(
|
||||
profile_default=profile).first()
|
||||
profil_default=profile).first()
|
||||
if port_profile:
|
||||
return port_profile
|
||||
else:
|
||||
|
|
Loading…
Reference in a new issue