Show More
@@ -75,7 +75,7 b' class ReposGroupsController(BaseControll' | |||||
75 | """ |
|
75 | """ | |
76 | self.__load_defaults() |
|
76 | self.__load_defaults() | |
77 |
|
77 | |||
78 | repo_group = RepoGroup.get(group_id) |
|
78 | repo_group = RepoGroup.get_or_404(group_id) | |
79 |
|
79 | |||
80 | data = repo_group.get_dict() |
|
80 | data = repo_group.get_dict() | |
81 |
|
81 | |||
@@ -277,12 +277,9 b' class ReposGroupsController(BaseControll' | |||||
277 | """GET /repos_groups/id: Show a specific item""" |
|
277 | """GET /repos_groups/id: Show a specific item""" | |
278 | # url('repos_group', id=ID) |
|
278 | # url('repos_group', id=ID) | |
279 |
|
279 | |||
280 | c.group = RepoGroup.get(id) |
|
280 | c.group = RepoGroup.get_or_404(id) | |
281 |
|
281 | |||
282 | if c.group: |
|
282 | c.group_repos = c.group.repositories.all() | |
283 | c.group_repos = c.group.repositories.all() |
|
|||
284 | else: |
|
|||
285 | return redirect(url('home')) |
|
|||
286 |
|
283 | |||
287 | #overwrite our cached list with current filter |
|
284 | #overwrite our cached list with current filter | |
288 | gr_filter = c.group_repos |
|
285 | gr_filter = c.group_repos |
@@ -172,9 +172,8 b' class UsersController(BaseController):' | |||||
172 | def edit(self, id, format='html'): |
|
172 | def edit(self, id, format='html'): | |
173 | """GET /users/id/edit: Form to edit an existing item""" |
|
173 | """GET /users/id/edit: Form to edit an existing item""" | |
174 | # url('edit_user', id=ID) |
|
174 | # url('edit_user', id=ID) | |
175 | c.user = User.get(id) |
|
175 | c.user = User.get_or_404(id) | |
176 | if not c.user: |
|
176 | ||
177 | return redirect(url('users')) |
|
|||
178 | if c.user.username == 'default': |
|
177 | if c.user.username == 'default': | |
179 | h.flash(_("You can't edit this user"), category='warning') |
|
178 | h.flash(_("You can't edit this user"), category='warning') | |
180 | return redirect(url('users')) |
|
179 | return redirect(url('users')) |
@@ -198,11 +198,8 b' class PullrequestsController(BaseRepoCon' | |||||
198 | repo_model = RepoModel() |
|
198 | repo_model = RepoModel() | |
199 | c.users_array = repo_model.get_users_js() |
|
199 | c.users_array = repo_model.get_users_js() | |
200 | c.users_groups_array = repo_model.get_users_groups_js() |
|
200 | c.users_groups_array = repo_model.get_users_groups_js() | |
201 | c.pull_request = PullRequest.get(pull_request_id) |
|
201 | c.pull_request = PullRequest.get_or_404(pull_request_id) | |
202 |
|
202 | |||
203 | # valid ID |
|
|||
204 | if not c.pull_request: |
|
|||
205 | raise HTTPNotFound |
|
|||
206 | cc_model = ChangesetCommentsModel() |
|
203 | cc_model = ChangesetCommentsModel() | |
207 | cs_model = ChangesetStatusModel() |
|
204 | cs_model = ChangesetStatusModel() | |
208 | _cs_statuses = cs_model.get_statuses(c.pull_request.org_repo, |
|
205 | _cs_statuses = cs_model.get_statuses(c.pull_request.org_repo, |
@@ -35,6 +35,7 b' from sqlalchemy.ext.hybrid import hybrid' | |||||
35 | from sqlalchemy.orm import relationship, joinedload, class_mapper, validates |
|
35 | from sqlalchemy.orm import relationship, joinedload, class_mapper, validates | |
36 | from sqlalchemy.exc import DatabaseError |
|
36 | from sqlalchemy.exc import DatabaseError | |
37 | from beaker.cache import cache_region, region_invalidate |
|
37 | from beaker.cache import cache_region, region_invalidate | |
|
38 | from webob.exc import HTTPNotFound | |||
38 |
|
39 | |||
39 | from pylons.i18n.translation import lazy_ugettext as _ |
|
40 | from pylons.i18n.translation import lazy_ugettext as _ | |
40 |
|
41 | |||
@@ -51,6 +52,7 b' from rhodecode.lib.caching_query import ' | |||||
51 | from rhodecode.model.meta import Base, Session |
|
52 | from rhodecode.model.meta import Base, Session | |
52 |
|
53 | |||
53 |
|
54 | |||
|
55 | ||||
54 | URL_SEP = '/' |
|
56 | URL_SEP = '/' | |
55 | log = logging.getLogger(__name__) |
|
57 | log = logging.getLogger(__name__) | |
56 |
|
58 | |||
@@ -142,6 +144,14 b' class BaseModel(object):' | |||||
142 | return cls.query().get(id_) |
|
144 | return cls.query().get(id_) | |
143 |
|
145 | |||
144 | @classmethod |
|
146 | @classmethod | |
|
147 | def get_or_404(cls, id_): | |||
|
148 | if id_: | |||
|
149 | res = cls.query().get(id_) | |||
|
150 | if not res: | |||
|
151 | raise HTTPNotFound | |||
|
152 | return res | |||
|
153 | ||||
|
154 | @classmethod | |||
145 | def getAll(cls): |
|
155 | def getAll(cls): | |
146 | return cls.query().all() |
|
156 | return cls.query().all() | |
147 |
|
157 |
General Comments 0
You need to be logged in to leave comments.
Login now