0001-models-modify-Role.to_json-and-Service.to_json-to-li.patch
src/authentic2/a2_rbac/models.py | ||
---|---|---|
157 | 157 |
'slug': self.slug, |
158 | 158 |
'is_admin': bool(self.admin_scope_ct and self.admin_scope_id), |
159 | 159 |
'is_service': bool(self.service), |
160 |
'ou__uuid': self.ou.uuid if self.ou else None, |
|
161 |
'ou__name': self.ou.name if self.ou else None, |
|
162 |
'ou__slug': self.ou.slug if self.ou else None, |
|
160 | 163 |
} |
161 | 164 | |
162 | 165 |
src/authentic2/custom_user/models.py | ||
---|---|---|
144 | 144 |
'uuid': self.uuid, |
145 | 145 |
'username': self.username, |
146 | 146 |
'email': self.email, |
147 |
'ou': unicode(self.ou) if self.ou else None, |
|
147 |
'ou': self.ou if self.ou else None, |
|
148 |
'ou__uuid': self.ou.uuid if self.ou else None, |
|
149 |
'ou__slug': self.ou.slug if self.ou else None, |
|
150 |
'ou__name': self.ou.name if self.ou else None, |
|
148 | 151 |
'first_name': self.first_name, |
149 | 152 |
'last_name': self.last_name, |
150 | 153 |
'is_superuser': self.is_superuser, |
src/authentic2/models.py | ||
---|---|---|
286 | 286 |
return { |
287 | 287 |
'name': self.name, |
288 | 288 |
'slug': self.slug, |
289 |
'ou': unicode(self.ou) if self.ou else None, |
|
289 |
'ou': self.ou if self.ou else None, |
|
290 |
'ou__uuid': self.ou.uuid if self.ou else None, |
|
291 |
'ou__name': self.ou.name if self.ou else None, |
|
292 |
'ou__slug': self.ou.slug if self.ou else None, |
|
290 | 293 |
'roles': [role.to_json() for role in roles], |
291 | 294 |
} |
292 |
- |