Mercurial > kallithea
changeset 2522:17893d61792a beta
Added associated classes into child models
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Sun, 01 Jul 2012 12:44:54 +0200 |
| parents | e4d2271e1193 |
| children | 788ae4f7d8df |
| files | 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 |
| diffstat | 10 files changed, 23 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/model/changeset_status.py Sun Jul 01 12:40:00 2012 +0200 +++ b/rhodecode/model/changeset_status.py Sun Jul 01 12:44:54 2012 +0200 @@ -34,6 +34,8 @@ class ChangesetStatusModel(BaseModel): + cls = ChangesetStatus + def __get_changeset_status(self, changeset_status): return self._get_instance(ChangesetStatus, changeset_status)
--- a/rhodecode/model/comment.py Sun Jul 01 12:40:00 2012 +0200 +++ b/rhodecode/model/comment.py Sun Jul 01 12:44:54 2012 +0200 @@ -41,6 +41,8 @@ class ChangesetCommentsModel(BaseModel): + cls = ChangesetComment + def __get_changeset_comment(self, changeset_comment): return self._get_instance(ChangesetComment, changeset_comment)
--- a/rhodecode/model/notification.py Sun Jul 01 12:40:00 2012 +0200 +++ b/rhodecode/model/notification.py Sun Jul 01 12:44:54 2012 +0200 @@ -40,6 +40,8 @@ class NotificationModel(BaseModel): + cls = Notification + def __get_notification(self, notification): if isinstance(notification, Notification): return notification
--- a/rhodecode/model/permission.py Sun Jul 01 12:40:00 2012 +0200 +++ b/rhodecode/model/permission.py Sun Jul 01 12:44:54 2012 +0200 @@ -42,6 +42,8 @@ Permissions model for RhodeCode """ + cls = Permission + def get_permission(self, permission_id, cache=False): """ Get's permissions by id
--- a/rhodecode/model/pull_request.py Sun Jul 01 12:40:00 2012 +0200 +++ b/rhodecode/model/pull_request.py Sun Jul 01 12:44:54 2012 +0200 @@ -40,6 +40,8 @@ class PullRequestModel(BaseModel): + cls = PullRequest + def get_all(self, repo): repo = self._get_repo(repo) return PullRequest.query().filter(PullRequest.other_repo == repo).all()
--- a/rhodecode/model/repo.py Sun Jul 01 12:40:00 2012 +0200 +++ b/rhodecode/model/repo.py Sun Jul 01 12:44:54 2012 +0200 @@ -48,6 +48,8 @@ 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)
--- a/rhodecode/model/repo_permission.py Sun Jul 01 12:40:00 2012 +0200 +++ b/rhodecode/model/repo_permission.py Sun Jul 01 12:44:54 2012 +0200 @@ -34,6 +34,8 @@ class RepositoryPermissionModel(BaseModel): + cls = UserRepoToPerm + def get_user_permission(self, repository, user): repository = self._get_repo(repository) user = self._get_user(user)
--- a/rhodecode/model/repos_group.py Sun Jul 01 12:40:00 2012 +0200 +++ b/rhodecode/model/repos_group.py Sun Jul 01 12:44:54 2012 +0200 @@ -39,6 +39,8 @@ 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)
--- a/rhodecode/model/user.py Sun Jul 01 12:40:00 2012 +0200 +++ b/rhodecode/model/user.py Sun Jul 01 12:44:54 2012 +0200 @@ -59,6 +59,7 @@ class UserModel(BaseModel): + cls = User def get(self, user_id, cache=False): user = self.sa.query(User) @@ -82,6 +83,9 @@ "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)
--- a/rhodecode/model/users_group.py Sun Jul 01 12:40:00 2012 +0200 +++ b/rhodecode/model/users_group.py Sun Jul 01 12:44:54 2012 +0200 @@ -44,6 +44,9 @@ 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)