Shu Zong Chen avatar Shu Zong Chen committed de35877

Fixing issues with scope

Comments (0)

Files changed (1)

 # Create your views here.
 from django.http import HttpResponse, HttpResponseNotFound
-from django import template
+from django import template as _template
 
 class SasabaView(object):
 	def __init__(self, manager, default_template = None):
 		self.default_template = default_template
 
 	def page(self, request, page = None, template = None):
-		c = template.RequestContext(request, {})
+		c = _template.RequestContext(request, {})
 		if page is None:
 			return Sasaba404(c, "Page is not set")
 
 		except (self.manager.DoesNotExist):
 			return Sasaba404(c, "Page does not exist")
 
-		templates = (p.template, self.default_template)
+		if template is None:
+			templates = (p.template, self.default_template)
+		else:
+			templates = (template,)
 		try:
-			t = template.loader.select_template(templates)
-		except (template.TemplateDoesNotExist):
+			t = _template.loader.select_template(templates)
+		except (_template.TemplateDoesNotExist):
 			return Sasaba404(c, "Template {0} does not exist".format(templates))
 		return SasabaContext(c, p, t)
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.