launchpad-reviewers team mailing list archive

[Raphaël Badin <raphael.badin@xxxxxxxxxxxxx>]

Raphaël Badin has proposed merging lp:~rvb/maas/maas-404-500 into lp:maas.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~rvb/maas/maas-404-500/+merge/95539

This branch adds proper 404.html and 500.html templates that will be used for 404 and 500 errors (!).  Previously, the templates were empty and in the wrong place (django requires them to be in the root of the template directory).
-- 
https://code.launchpad.net/~rvb/maas/maas-404-500/+merge/95539
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~rvb/maas/maas-404-500 into lp:maas.

=== modified file 'src/maas/settings.py'
--- src/maas/settings.py	2012-03-02 10:05:25 +0000
+++ src/maas/settings.py	2012-03-02 11:50:53 +0000
@@ -165,6 +165,7 @@
     "django.contrib.auth.context_processors.auth",
     "django.core.context_processors.debug",
     "django.core.context_processors.i18n",
+    "django.core.context_processors.request",
     "django.core.context_processors.media",
     "django.core.context_processors.static",
     #"django.core.context_processors.tz",

=== renamed file 'src/maasserver/templates/maasserver/404.html' => 'src/maasserver/templates/404.html'
--- src/maasserver/templates/maasserver/404.html	2012-01-16 08:33:18 +0000
+++ src/maasserver/templates/404.html	2012-03-02 11:50:53 +0000
@@ -0,0 +1,10 @@
+{% extends "maasserver/base.html" %}
+
+{% block title %}Error: Page not found{% endblock %}
+{% block page-title %}Error: Page not found{% endblock %}
+
+{% block content %}
+  <h2>
+    The requested URL {{ request.path }} was not found on this server.
+  </h2>
+{% endblock %}

=== renamed file 'src/maasserver/templates/maasserver/500.html' => 'src/maasserver/templates/500.html'
--- src/maasserver/templates/maasserver/500.html	2012-01-16 08:33:18 +0000
+++ src/maasserver/templates/500.html	2012-03-02 11:50:53 +0000
@@ -0,0 +1,10 @@
+{% extends "maasserver/base.html" %}
+
+{% block title %}Error: Internal server error{% endblock %}
+{% block page-title %}Error: Internal server error{% endblock %}
+
+{% block content %}
+  <h2>
+    Internal server error.
+  </h2>
+{% endblock %}