Added associated classes into child models

--HG--
branch : beta

10 files changed, 23 insertions, 0 deletions

diff --git a/rhodecode/model/changeset_status.py b/rhodecode/model/changeset_status.py
index b33bfebb..6a14c0a3 100644
--- a/rhodecode/model/changeset_status.py
+++ b/rhodecode/model/changeset_status.py
@@ -34,6 +34,8 @@ log = logging.getLogger(__name__)
 
 class ChangesetStatusModel(BaseModel):
 
+    cls = ChangesetStatus
+
     def __get_changeset_status(self, changeset_status):
         return self._get_instance(ChangesetStatus, changeset_status)
 
diff --git a/rhodecode/model/comment.py b/rhodecode/model/comment.py
index a3f67b26..6d63c590 100644
--- a/rhodecode/model/comment.py
+++ b/rhodecode/model/comment.py
@@ -41,6 +41,8 @@ log = logging.getLogger(__name__)
 
 class ChangesetCommentsModel(BaseModel):
 
+    cls = ChangesetComment
+
     def __get_changeset_comment(self, changeset_comment):
         return self._get_instance(ChangesetComment, changeset_comment)
 
diff --git a/rhodecode/model/notification.py b/rhodecode/model/notification.py
index b2df14ba..589c5202 100644
--- a/rhodecode/model/notification.py
+++ b/rhodecode/model/notification.py
@@ -40,6 +40,8 @@ log = logging.getLogger(__name__)
 
 class NotificationModel(BaseModel):
 
+    cls = Notification
+
     def __get_notification(self, notification):
         if isinstance(notification, Notification):
             return notification
diff --git a/rhodecode/model/permission.py b/rhodecode/model/permission.py
index 995bf00c..3467c852 100644
--- a/rhodecode/model/permission.py
+++ b/rhodecode/model/permission.py
@@ -42,6 +42,8 @@ class PermissionModel(BaseModel):
     Permissions model for RhodeCode
     """
 
+    cls = Permission
+
     def get_permission(self, permission_id, cache=False):
         """
         Get's permissions by id
diff --git a/rhodecode/model/pull_request.py b/rhodecode/model/pull_request.py
index 056f91d4..dd7bb876 100644
--- a/rhodecode/model/pull_request.py
+++ b/rhodecode/model/pull_request.py
@@ -40,6 +40,8 @@ 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()
diff --git a/rhodecode/model/repo.py b/rhodecode/model/repo.py
index 3fa5da1f..b35e650d 100644
--- a/rhodecode/model/repo.py
+++ b/rhodecode/model/repo.py
@@ -48,6 +48,8 @@ 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)
diff --git a/rhodecode/model/repo_permission.py b/rhodecode/model/repo_permission.py
index 4424429c..6424e2a0 100644
--- a/rhodecode/model/repo_permission.py
+++ b/rhodecode/model/repo_permission.py
@@ -34,6 +34,8 @@ 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)
diff --git a/rhodecode/model/repos_group.py b/rhodecode/model/repos_group.py
index 5fcac00a..97be4f52 100644
--- a/rhodecode/model/repos_group.py
+++ b/rhodecode/model/repos_group.py
@@ -39,6 +39,8 @@ 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)
diff --git a/rhodecode/model/user.py b/rhodecode/model/user.py
index 5b4f9595..ce84fa25 100644
--- a/rhodecode/model/user.py
+++ b/rhodecode/model/user.py
@@ -59,6 +59,7 @@ PERM_WEIGHTS = {
 
 
 class UserModel(BaseModel):
+    cls = User
 
     def get(self, user_id, cache=False):
         user = self.sa.query(User)
@@ -82,6 +83,9 @@ class UserModel(BaseModel):
                                           "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)
 
diff --git a/rhodecode/model/users_group.py b/rhodecode/model/users_group.py
index 998662b3..ca0a864b 100644
--- a/rhodecode/model/users_group.py
+++ b/rhodecode/model/users_group.py
@@ -44,6 +44,9 @@ class UsersGroupModel(BaseModel):
     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)