engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

db: use consistent order of auth-tokens and emails when fetching those from user.

Browse source
This commit is contained in:
Marcin Kuzminski 2017-07-27 18:13:25 +02:00
parent 42d56172a4
commit 384dcf30c0
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
rhodecode/model/db.py
View file

@ -615,7 +615,10 @@ class User(Base, BaseModel):
@property
def emails(self):
other = UserEmailMap.query().filter(UserEmailMap.user == self).all()
other = UserEmailMap.query()\
.filter(UserEmailMap.user == self) \
.order_by(UserEmailMap.email_id.asc()) \
.all()
return [self.email] + [x.email for x in other]
@property
@ -624,7 +627,10 @@ class User(Base, BaseModel):
return [x.api_key for x in auth_tokens]
def get_auth_tokens(self):
return UserApiKeys.query().filter(UserApiKeys.user == self).all()
return UserApiKeys.query()\
.filter(UserApiKeys.user == self)\
.order_by(UserApiKeys.user_api_key_id.asc())\
.all()
@property
def feed_token(self):