rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-05 09:26:27 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix_divers_front' into 'dev'

Browse source 
Fix edition des roles + kwargs edition user

See merge request federez/re2o!319
This commit is contained in:
chirac 2018-09-29 22:59:19 +02:00
commit 54273c29ee
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
machines/models.py
View file

@ -1653,12 +1653,12 @@ class Role(RevMixin, AclMixin, models.Model):
) )
@classmethod @classmethod
def get_instance(cls, machineid, *_args, **_kwargs): def get_instance(cls, roleid, *_args, **_kwargs):
"""Get the Machine instance with machineid. """Get the Machine instance with machineid.
:param userid: The id :param userid: The id
:return: The user :return: The user
""" """
return cls.objects.get(pk=machineid) return cls.objects.get(pk=roleid)
@classmethod @classmethod
def interface_for_roletype(cls, roletype): def interface_for_roletype(cls, roletype):

2
users/forms.py
View file

@ -391,7 +391,7 @@ class AdherentCreationForm(AdherentForm):
class AdherentEditForm(AdherentForm): class AdherentEditForm(AdherentForm):
"""Formulaire d'édition d'un user. """Formulaire d'édition d'un user.
AdherentForm incluant la modification des champs gpg et shell""" AdherentForm incluant la modification des champs gpg et shell"""
def __init__(self, *args, **kargs): def __init__(self, *args, **kwargs):
super(AdherentEditForm, self).__init__(*args, **kwargs) super(AdherentEditForm, self).__init__(*args, **kwargs)
self.fields['gpg_fingerprint'].widget.attrs['placeholder'] = _("Leave empty if you don't have any GPG key.") self.fields['gpg_fingerprint'].widget.attrs['placeholder'] = _("Leave empty if you don't have any GPG key.")
if 'shell' in self.fields: if 'shell' in self.fields: