projects
/
osm
/
LW-UI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into v6.0
[osm/LW-UI.git]
/
authosm
/
models.py
diff --git
a/authosm/models.py
b/authosm/models.py
index
790e684
..
74c1f1e
100644
(file)
--- a/
authosm/models.py
+++ b/
authosm/models.py
@@
-67,8
+67,9
@@
class AbstractOsmUser(AbstractBaseUser, PermissionsMixin):
current_project = models.CharField(_('project_id'), max_length=255)
psw = models.CharField(_('psw'), max_length=36)
current_project = models.CharField(_('project_id'), max_length=255)
psw = models.CharField(_('psw'), max_length=36)
- token = models.CharField(_('token'), max_length=
36
)
+ token = models.CharField(_('token'), max_length=
255
)
project_id = models.CharField(_('project_id'), max_length=36)
project_id = models.CharField(_('project_id'), max_length=36)
+ project_name = models.CharField(_('project_name'), max_length=36, default='')
token_expires = models.FloatField(_('token_expires'), max_length=36)
objects = OsmUserManager()
token_expires = models.FloatField(_('token_expires'), max_length=36)
objects = OsmUserManager()
@@
-91,11
+92,11
@@
class AbstractOsmUser(AbstractBaseUser, PermissionsMixin):
def get_projects(self):
client = Client()
def get_projects(self):
client = Client()
-
result
= client.get_user_info(self.get_token(), self.username)
- if 'error' in
result and result
['error'] is True:
+
user_info
= client.get_user_info(self.get_token(), self.username)
+ if 'error' in
user_info and user_info
['error'] is True:
return []
else:
return []
else:
- return
result['data']['project
s']
+ return
user_info['data']['project_role_mapping
s']
def switch_project(self, project_id):
client = Client()
def switch_project(self, project_id):
client = Client()
@@
-105,6
+106,7
@@
class AbstractOsmUser(AbstractBaseUser, PermissionsMixin):
else:
self.token = result['data']['id']
self.project_id = result['data']['project_id']
else:
self.token = result['data']['id']
self.project_id = result['data']['project_id']
+ self.project_name = result['data']['project_name']
self.token_expires = result['data']['expires']
self.save()
return True
self.token_expires = result['data']['expires']
self.save()
return True