kallithea Changeset - 17893d61792a

Changeset - 17893d61792a

Parent rev.

Child rev.

[Not reviewed]

beta

0 10 0

Marcin Kuzminski - 13 years ago 2012-07-01 12:44:54
marcin@python-works.com

Added associated classes into child models

10 files changed with 23 insertions and 0 deletions:

rhodecode/model/changeset_status.py

rhodecode/model/comment.py

rhodecode/model/notification.py

rhodecode/model/permission.py

rhodecode/model/pull_request.py

rhodecode/model/repo.py

rhodecode/model/repo_permission.py

rhodecode/model/repos_group.py

rhodecode/model/user.py

rhodecode/model/users_group.py

0 comments (0 inline, 0 general)

rhodecode/model/changeset_status.py

➞

Show inline comments

@@ @@ -31,12 +31,14 @@ from rhodecode.model.db import Changeset @@
 log = logging.getLogger(__name__)
 class ChangesetStatusModel(BaseModel):
     cls = ChangesetStatus
     def __get_changeset_status(self, changeset_status):
         return self._get_instance(ChangesetStatus, changeset_status)
     def __get_pull_request(self, pull_request):
         return self._get_instance(PullRequest, pull_request)

rhodecode/model/comment.py

➞

Show inline comments

@@ @@ -38,12 +38,14 @@ from rhodecode.model.notification import @@
 log = logging.getLogger(__name__)
 class ChangesetCommentsModel(BaseModel):
     cls = ChangesetComment
     def __get_changeset_comment(self, changeset_comment):
         return self._get_instance(ChangesetComment, changeset_comment)
     def __get_pull_request(self, pull_request):
         return self._get_instance(PullRequest, pull_request)

rhodecode/model/notification.py

➞

Show inline comments

@@ @@ -37,12 +37,14 @@ from rhodecode.model.db import Notificat @@
 log = logging.getLogger(__name__)
 class NotificationModel(BaseModel):
     cls = Notification
     def __get_notification(self, notification):
         if isinstance(notification, Notification):
             return notification
         elif isinstance(notification, (int, long)):
             return Notification.get(notification)
         else:

rhodecode/model/permission.py

➞

Show inline comments

@@ @@ -39,12 +39,14 @@ log = logging.getLogger(__name__) @@
 class PermissionModel(BaseModel):
     """
     Permissions model for RhodeCode
     """
     cls = Permission
     def get_permission(self, permission_id, cache=False):
         """
         Get's permissions by id
         :param permission_id: id of permission to get from database
         :param cache: use Cache for this query

rhodecode/model/pull_request.py

➞

Show inline comments

@@ @@ -37,12 +37,14 @@ from rhodecode.lib.vcs.utils.hgcompat im @@
 log = logging.getLogger(__name__)
 class PullRequestModel(BaseModel):
     cls = PullRequest
     def get_all(self, repo):
         repo = self._get_repo(repo)
         return PullRequest.query().filter(PullRequest.other_repo == repo).all()
     def create(self, created_by, org_repo, org_ref, other_repo,
                other_ref, revisions, reviewers, title, description=None):

rhodecode/model/repo.py

➞

Show inline comments

@@ @@ -45,12 +45,14 @@ from rhodecode.lib import helpers as h @@
 log = logging.getLogger(__name__)
 class RepoModel(BaseModel):
     cls = Repository
     def __get_users_group(self, users_group):
         return self._get_instance(UsersGroup, users_group,
                                   callback=UsersGroup.get_by_group_name)
     def __get_repos_group(self, repos_group):
         return self._get_instance(RepoGroup, repos_group,

rhodecode/model/repo_permission.py

➞

Show inline comments

@@ @@ -31,12 +31,14 @@ from rhodecode.model.db import UserRepoT @@
 log = logging.getLogger(__name__)
 class RepositoryPermissionModel(BaseModel):
     cls = UserRepoToPerm
     def get_user_permission(self, repository, user):
         repository = self._get_repo(repository)
         user = self._get_user(user)
         return UserRepoToPerm.query() \
                 .filter(UserRepoToPerm.user == user) \

rhodecode/model/repos_group.py

➞

Show inline comments

@@ @@ -36,12 +36,14 @@ from rhodecode.model.db import RepoGroup @@
 log = logging.getLogger(__name__)
 class ReposGroupModel(BaseModel):
     cls = RepoGroup
     def __get_users_group(self, users_group):
         return self._get_instance(UsersGroup, users_group,
                                   callback=UsersGroup.get_by_group_name)
     def __get_repos_group(self, repos_group):
         return self._get_instance(RepoGroup, repos_group,

rhodecode/model/user.py

➞

Show inline comments

@@ @@ -56,12 +56,13 @@ PERM_WEIGHTS = { @@
     'group.write': 3,
     'group.admin': 4,
+}
 class UserModel(BaseModel):
     cls = User
     def get(self, user_id, cache=False):
         user = self.sa.query(User)
         if cache:
             user = user.options(FromCache("sql_cache_short",
                                           "get_user_%s" % user_id))
@@ @@ -79,12 +80,15 @@ class UserModel(BaseModel): @@
                 .filter(User.username == username)
         if cache:
             user = user.options(FromCache("sql_cache_short",
                                           "get_user_%s" % username))
         return user.scalar()
     def get_by_email(self, email, cache=False, case_insensitive=False):
         return User.get_by_email(email, case_insensitive, cache)
     def get_by_api_key(self, api_key, cache=False):
         return User.get_by_api_key(api_key, cache)
     def create(self, form_data):
         from rhodecode.lib.auth import get_crypt_password
         try:

rhodecode/model/users_group.py

➞

Show inline comments

@@ @@ -41,12 +41,15 @@ class UsersGroupModel(BaseModel): @@
         return self._get_instance(UsersGroup, users_group,
                                   callback=UsersGroup.get_by_group_name)
     def get(self, users_group_id, cache=False):
         return UsersGroup.get(users_group_id)
     def get_group(self, users_group):
         return self.__get_users_group(users_group)
     def get_by_name(self, name, cache=False, case_insensitive=False):
         return UsersGroup.get_by_group_name(name, cache, case_insensitive)
     def create(self, name, active=True):
         try:
             new = UsersGroup()

0 comments (0 inline, 0 general)