Commit 768c0853 by Piotr Mitros

We can now use Amazon S3

parent c99bc566
...@@ -14,6 +14,9 @@ ...@@ -14,6 +14,9 @@
from mako.lookup import TemplateLookup from mako.lookup import TemplateLookup
import tempfile import tempfile
from django.template import RequestContext
requestcontext = None
class MakoMiddleware(object): class MakoMiddleware(object):
def __init__(self): def __init__(self):
...@@ -39,3 +42,7 @@ class MakoMiddleware(object): ...@@ -39,3 +42,7 @@ class MakoMiddleware(object):
import mitxmako import mitxmako
mitxmako.lookup = lookup mitxmako.lookup = lookup
def process_request (self, request):
global requestcontext
requestcontext = RequestContext(request)
# print requestcontext
...@@ -16,6 +16,9 @@ from django.template import Context ...@@ -16,6 +16,9 @@ from django.template import Context
from django.http import HttpResponse from django.http import HttpResponse
import middleware import middleware
from django.conf import settings
from mitxmako.middleware import requestcontext
def render_to_string(template_name, dictionary, context_instance=None): def render_to_string(template_name, dictionary, context_instance=None):
context_instance = context_instance or Context(dictionary) context_instance = context_instance or Context(dictionary)
...@@ -23,6 +26,8 @@ def render_to_string(template_name, dictionary, context_instance=None): ...@@ -23,6 +26,8 @@ def render_to_string(template_name, dictionary, context_instance=None):
context_instance.update(dictionary or {}) context_instance.update(dictionary or {})
# collapse context_instance to a single dictionary for mako # collapse context_instance to a single dictionary for mako
context_dictionary = {} context_dictionary = {}
context_instance['settings'] = settings
context_instance['request_context'] = requestcontext
for d in context_instance: for d in context_instance:
context_dictionary.update(d) context_dictionary.update(d)
# fetch and render template # fetch and render template
......
...@@ -4,7 +4,9 @@ import sys ...@@ -4,7 +4,9 @@ import sys
import djcelery import djcelery
LIB_URL = '/static/lib/' LIB_URL = '/static/lib/'
LIB_URL = 'http://mitxstatic.s3-website-us-east-1.amazonaws.com/js/'
BOOK_URL = '/static/book/' BOOK_URL = '/static/book/'
BOOK_URL = 'http://mitxstatic.s3-website-us-east-1.amazonaws.com/book_images/'
# Our parent dir (mitx_all) is the BASE_DIR # Our parent dir (mitx_all) is the BASE_DIR
BASE_DIR = os.path.abspath(os.path.join(__file__, "..", "..")) BASE_DIR = os.path.abspath(os.path.join(__file__, "..", ".."))
...@@ -327,3 +329,4 @@ BROKER_TRANSPORT = "djkombu.transport.DatabaseTransport" ...@@ -327,3 +329,4 @@ BROKER_TRANSPORT = "djkombu.transport.DatabaseTransport"
CELERY_ALWAYS_EAGER = True CELERY_ALWAYS_EAGER = True
djcelery.setup_loader() djcelery.setup_loader()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment