kallithea Changeset - 43cb5b6047fd

Changeset - 43cb5b6047fd

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 13 years ago 2012-06-26 02:21:06
marcin@python-works.com

Added functions for getting API data to repo and user models

1 file changed with 41 insertions and 0 deletions:

rhodecode/model/db.py

0 comments (0 inline, 0 general)

rhodecode/model/db.py

➞

Show inline comments

@@ @@ -427,6 +427,26 @@ class User(Base, BaseModel): @@
         Session.add(self)
         log.debug('updated user %s lastlogin' % self.username)
     def get_api_data(self):
         """
         Common function for generating user related data for API
         """
         user = self
         data = dict(
             id=user.user_id,
             username=user.username,
             api_key=user.api_key,
             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,
+        )
         return data
     def __json__(self):
         return dict(
             user_id=self.user_id,
@@ @@ -734,6 +754,27 @@ class Repository(Base, BaseModel): @@
         return is_valid_repo(repo_name, cls.base_path())
     def get_api_data(self):
         """
         Common function for generating repo api data
         """
         repo = self
         data = dict(
             id=repo.repo_id,
             repo_name=repo.repo_name,
             repo_type=repo.repo_type,
             clone_uri=repo.clone_uri,
             private=repo.private,
             created_on=repo.created_on,
             description=repo.description,
             landing_rev=repo.landing_rev,
             owner=repo.user.username,
             fork_of=repo.fork.repo_name if repo.fork else None
+        )
         return data
     #==========================================================================
     # SCM PROPERTIES
     #==========================================================================

0 comments (0 inline, 0 general)