Commit 30265826 authored by jens.kleineheismann's avatar jens.kleineheismann

Merge branch 'fix-user-model' (bugfixes from Daniel Bacher).

parents e9727ba0 45e989a5
...@@ -134,7 +134,7 @@ class User(Model): ...@@ -134,7 +134,7 @@ class User(Model):
self.samaccount = data['samaccount'] self.samaccount = data['samaccount']
self.firstname = data['firstname'] self.firstname = data['firstname']
self.lastname = data['lastname'] self.lastname = data['lastname']
self.oe = Oe(client=self.client, data=data['oe']) self.oe = Oe(client=self.client, pk=data['oe'])
self.pk = getattr(self, SYMBOLS['USER_PK_ATTRIB']) self.pk = getattr(self, SYMBOLS['USER_PK_ATTRIB'])
def _save_data_attribs(self): def _save_data_attribs(self):
...@@ -143,6 +143,6 @@ class User(Model): ...@@ -143,6 +143,6 @@ class User(Model):
def get_groups(self): def get_groups(self):
self.load() self.load()
l = self.client.get_user_groups(pk=self.pk) l = self.client.get_user_groups(pk=self.pk)
for d in l: for d in l['all']:
y = Group(client=self.client, data=d) y = Group(client=self.client, data=d)
yield y yield y
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment