kallithea Changeset - 7e3e9d0c5575

Changeset - 7e3e9d0c5575

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 13 years ago 2012-06-25 23:16:14
marcin@python-works.com

Add list of all emails that user may have into get_user call

3 files changed with 7 insertions and 0 deletions:

docs/api/api.rst

rhodecode/controllers/api/api.py

rhodecode/model/db.py

0 comments (0 inline, 0 general)

docs/api/api.rst

➞

Show inline comments

@@ @@ -143,24 +143,25 @@ INPUT:: @@
                 "userid" : "<username or user_id>"
+              }
 OUTPUT::
     result: None if user does not exist or
+            {
                 "id" :       "<id>",
                 "username" : "<username>",
                 "firstname": "<firstname>",
                 "lastname" : "<lastname>",
                 "email" :    "<email>",
                 "emails":    "<list_of_all_additional_emails>",
                 "active" :   "<bool>",
                 "admin" :    "<bool>",
                 "ldap_dn" :  "<ldap_dn>",
                 "last_login": "<last_login>",
                 "permissions": {
                     "global": ["hg.create.repository",
                                "repository.read",
                                "hg.register.manual_activate"],
                     "repositories": {"repo1": "repository.none"},
                     "repositories_groups": {"Group1": "group.read"}
                  },
+            }

rhodecode/controllers/api/api.py

➞

Show inline comments

@@ @@ -88,24 +88,25 @@ class ApiController(JSONRPCController): @@
         """
         user = UserModel().get_user(userid)
         if user is None:
             return user
         return dict(
             id=user.user_id,
             username=user.username,
             firstname=user.name,
             lastname=user.lastname,
             email=user.email,
             emails=user.emails,
             active=user.active,
             admin=user.admin,
             ldap_dn=user.ldap_dn,
             last_login=user.last_login,
             permissions=AuthUser(user_id=user.user_id).permissions
+        )
     @HasPermissionAllDecorator('hg.admin')
     def get_users(self, apiuser):
         """"
         Get all users

rhodecode/model/db.py

➞

Show inline comments

@@ @@ -332,24 +332,29 @@ class User(Base, BaseModel): @@
     # comments created by this user
     user_comments = relationship('ChangesetComment', cascade='all')
     @hybrid_property
     def email(self):
         return self._email
     @email.setter
     def email(self, val):
         self._email = val.lower() if val else None
     @property
     def emails(self):
         other = UserEmailMap.query().filter(UserEmailMap.user==self).all()
         return [self.email] + [x.email for x in other]
     @property
     def full_name(self):
         return '%s %s' % (self.name, self.lastname)
     @property
     def full_name_or_username(self):
         return ('%s %s' % (self.name, self.lastname)
                 if (self.name and self.lastname) else self.username)
     @property
     def full_contact(self):
         return '%s %s <%s>' % (self.name, self.lastname, self.email)

0 comments (0 inline, 0 general)