kallithea Changeset - fddd8e3fc157

Changeset - fddd8e3fc157

Parent rev.

Child rev.

[Not reviewed]

beta

0 4 0

Marcin Kuzminski - 13 years ago 2012-06-20 21:42:05
marcin@python-works.com

use get_or_404 where possible

4 files changed with 16 insertions and 13 deletions:

rhodecode/controllers/admin/repos_groups.py

rhodecode/controllers/admin/users.py

rhodecode/controllers/pullrequests.py

rhodecode/model/db.py

0 comments (0 inline, 0 general)

rhodecode/controllers/admin/repos_groups.py

➞

Show inline comments

@@ @@ -72,13 +72,13 @@ class ReposGroupsController(BaseControll @@
         Load defaults settings for edit, and update
         :param group_id:
         """
         self.__load_defaults()
-        repo_group = RepoGroup.get(group_id)
+        repo_group = RepoGroup.get_or_404(group_id)
         data = repo_group.get_dict()
         data['group_name'] = repo_group.name
         # fill repository users
@@ @@ -274,18 +274,15 @@ class ReposGroupsController(BaseControll @@
     @HasReposGroupPermissionAnyDecorator('group.read', 'group.write',
                                          'group.admin')
     def show(self, id, format='html'):
         """GET /repos_groups/id: Show a specific item"""
         # url('repos_group', id=ID)
-        c.group = RepoGroup.get(id)
+        c.group = RepoGroup.get_or_404(id)
         if c.group:
             c.group_repos = c.group.repositories.all()
         else:
             return redirect(url('home'))
         c.group_repos = c.group.repositories.all()
         #overwrite our cached list with current filter
         gr_filter = c.group_repos
         c.cached_repo_list = self.scm_model.get_repos(all_repos=gr_filter)
         c.repos_list = c.cached_repo_list

rhodecode/controllers/admin/users.py

➞

Show inline comments

@@ @@ -169,15 +169,14 @@ class UsersController(BaseController): @@
         """GET /users/id: Show a specific item"""
         # url('user', id=ID)
     def edit(self, id, format='html'):
         """GET /users/id/edit: Form to edit an existing item"""
         # url('edit_user', id=ID)
         c.user = User.get(id)
         if not c.user:
             return redirect(url('users'))
         c.user = User.get_or_404(id)
         if c.user.username == 'default':
             h.flash(_("You can't edit this user"), category='warning')
             return redirect(url('users'))
         c.perm_user = AuthUser(user_id=id)
         c.user.permissions = {}
         c.granted_permissions = UserModel().fill_perms(c.user)\

rhodecode/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -195,17 +195,14 @@ class PullrequestsController(BaseRepoCon @@
             c.changes[fid] = [f['operation'], f['filename'], diff]
     def show(self, repo_name, pull_request_id):
         repo_model = RepoModel()
         c.users_array = repo_model.get_users_js()
         c.users_groups_array = repo_model.get_users_groups_js()
-        c.pull_request = PullRequest.get(pull_request_id)
+        c.pull_request = PullRequest.get_or_404(pull_request_id)
         # valid ID
         if not c.pull_request:
             raise HTTPNotFound
         cc_model = ChangesetCommentsModel()
         cs_model = ChangesetStatusModel()
         _cs_statuses = cs_model.get_statuses(c.pull_request.org_repo,
                                             pull_request=c.pull_request,
                                             with_revisions=True)

rhodecode/model/db.py

➞

Show inline comments

@@ @@ -32,12 +32,13 @@ from collections import defaultdict @@
 from sqlalchemy import *
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm import relationship, joinedload, class_mapper, validates
 from sqlalchemy.exc import DatabaseError
 from beaker.cache import cache_region, region_invalidate
 from webob.exc import HTTPNotFound
 from pylons.i18n.translation import lazy_ugettext as _
 from rhodecode.lib.vcs import get_backend
 from rhodecode.lib.vcs.utils.helpers import get_scm
 from rhodecode.lib.vcs.exceptions import VCSError
@@ @@ -48,12 +49,13 @@ from rhodecode.lib.utils2 import str2boo @@
 from rhodecode.lib.compat import json
 from rhodecode.lib.caching_query import FromCache
 from rhodecode.model.meta import Base, Session
 URL_SEP = '/'
 log = logging.getLogger(__name__)
 #==============================================================================
 # BASE CLASSES
 #==============================================================================
@@ @@ -139,12 +141,20 @@ class BaseModel(object): @@
     @classmethod
     def get(cls, id_):
         if id_:
             return cls.query().get(id_)
     @classmethod
     def get_or_404(cls, id_):
         if id_:
             res = cls.query().get(id_)
             if not res:
                 raise HTTPNotFound
             return res
     @classmethod
     def getAll(cls):
         return cls.query().all()
     @classmethod
     def delete(cls, id_):
         obj = cls.query().get(id_)

0 comments (0 inline, 0 general)