[Maposmatic-dev] [PATCH] Simplify RequestContext management.

[gael . utard]

From: Gaël Utard <address@hidden>

Signed-off-by: Gaël Utard <address@hidden>
---
 www/maposmatic/context_processors.py |    2 ++
 www/maposmatic/views.py              |   19 ++++++-------------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/www/maposmatic/context_processors.py 
b/www/maposmatic/context_processors.py
index b9b3348..5350493 100644
--- a/www/maposmatic/context_processors.py
+++ b/www/maposmatic/context_processors.py
@@ -24,6 +24,7 @@
 from models import MapRenderingJob
 from django.core.urlresolvers import reverse
 import feedparser
+import www.settings
 
 def get_latest_blog_posts():
     f = feedparser.parse("http://news.maposmatic.org/?feed=rss2";)
@@ -37,4 +38,5 @@ def all(request):
     d = {}
     d['randommap'] = MapRenderingJob.objects.get_random_with_thumbnail()
     d['blogposts'] = get_latest_blog_posts()
+    d['MAPOSMATIC_DAEMON_RUNNING'] = www.settings.is_daemon_running()
     return d
diff --git a/www/maposmatic/views.py b/www/maposmatic/views.py
index af6020d..5293b3d 100644
--- a/www/maposmatic/views.py
+++ b/www/maposmatic/views.py
@@ -44,22 +44,15 @@ except ImportError:
     except ImportError:
         from json import write as json_encode
 
-def rc_add_status(context):
-    return {'MAPOSMATIC_DAEMON_RUNNING': www.settings.is_daemon_running()}
-
-class MapOSMaticRequestContext(RequestContext):
-    def __init__(self, request):
-        RequestContext.__init__(self, request, {}, [rc_add_status])
-
 def index(request):
     """The main page."""
     return render_to_response('maposmatic/index.html',
-                              
context_instance=MapOSMaticRequestContext(request))
+                              context_instance=RequestContext(request))
 
 def about(request):
     """The about page."""
     return render_to_response('maposmatic/about.html',
-                              
context_instance=MapOSMaticRequestContext(request))
+                              context_instance=RequestContext(request))
 
 def new(request):
     """The map creation page and form."""
@@ -91,7 +84,7 @@ def new(request):
 
     return render_to_response('maposmatic/new.html',
                               { 'form' : form },
-                              
context_instance=MapOSMaticRequestContext(request))
+                              context_instance=RequestContext(request))
 
 def job(request, job_id, job_nonce=None):
     """The job details page.
@@ -112,7 +105,7 @@ def job(request, job_id, job_nonce=None):
                               { 'job': job, 'single': True,
                                 'redirected': isredirected, 'nonce': job_nonce,
                                 'refresh': refresh, 'refresh_ms': 
(refresh*1000) },
-                              
context_instance=MapOSMaticRequestContext(request))
+                              context_instance=RequestContext(request))
 
 def all_jobs(request):
     """Displays all jobs from the last 24 hours."""
@@ -136,7 +129,7 @@ def all_jobs(request):
     return render_to_response('maposmatic/all_jobs.html',
                               { 'jobs': jobs,
                                 'pages': helpers.get_pages_list(jobs, 
paginator) },
-                              
context_instance=MapOSMaticRequestContext(request))
+                              context_instance=RequestContext(request))
 
 def all_maps(request):
     """Displays all maps, sorted alphabetically, eventually matching the search
@@ -176,7 +169,7 @@ def all_maps(request):
                               { 'maps': maps, 'form': form,
                                 'is_search': form.is_valid(),
                                 'pages': helpers.get_pages_list(maps, 
paginator) },
-                              
context_instance=MapOSMaticRequestContext(request))
+                              context_instance=RequestContext(request))
 
 def query_nominatim(request, format, squery):
     """Nominatim query gateway."""
-- 
1.7.0.4