Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

display 404 page when accessing wrong url #22

Merged
merged 3 commits into from Sep 10, 2012
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 16 additions & 4 deletions warp/crud/render.py
Expand Up @@ -142,9 +142,18 @@ def _getViewTemplate(self):
_getEditTemplate = _getViewTemplate


def getRequestObject(self, request):
try:
objID = int(request.resource.args[0])
except Exception:
return None
return request.store.get(self.model, objID)

def render_view(self, request):
objID = int(request.resource.args[0])
obj = request.store.get(self.model, objID)
obj = self.getRequestObject(request)
if obj is None:
template = templateLookup.get_template("/error_404.mak")
return helpers.renderTemplateObj(request, template)

return helpers.renderTemplateObj(request,
self._getViewTemplate(),
Expand All @@ -154,8 +163,11 @@ def render_view(self, request):


def render_edit(self, request):
objID = int(request.resource.args[0])
obj = request.store.get(self.model, objID)
obj = self.getRequestObject(request)
if obj is None:
template = templateLookup.get_template("/error_404.mak")
return helpers.renderTemplateObj(request, template)

crud = self.crudModel(obj)

return helpers.renderTemplateObj(request,
Expand Down
4 changes: 4 additions & 0 deletions warp/templates/error_404.mak
@@ -0,0 +1,4 @@
<%inherit file="/site.mak"/>

<h2>Error 404</h2>
<div class="error">The requested URL cannot be found.</div>