From 7b074424b540db5ad9b2c0c5840de04162680134 Mon Sep 17 00:00:00 2001
From: David Ormsbee <dave@edx.org>
Date: Wed, 19 Jun 2013 14:39:02 -0400
Subject: [PATCH 1/2] Initialize MakoMiddleware manually during certificate
 grading runs.

Without this, problems fail to load because they can't find how to
render themselves, and the certificate generation grading run will
get an inaccurately low count of the possible points a user could
get (anything they didn't see will be omitted), inflating their
grade during certificate calculation and making it inconsistent
with their Progress page.
---
 lms/djangoapps/certificates/queue.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/lms/djangoapps/certificates/queue.py b/lms/djangoapps/certificates/queue.py
index b4632ce9ab..af1037f903 100644
--- a/lms/djangoapps/certificates/queue.py
+++ b/lms/djangoapps/certificates/queue.py
@@ -3,6 +3,7 @@ from certificates.models import certificate_status_for_student
 from certificates.models import CertificateStatuses as status
 from certificates.models import CertificateWhitelist
 
+from mitxmako.middleware import MakoMiddleware
 from courseware import grades, courses
 from django.test.client import RequestFactory
 from capa.xqueue_interface import XQueueInterface
@@ -51,6 +52,14 @@ class XQueueCertInterface(object):
     """
 
     def __init__(self, request=None):
+        # MakoMiddleware Note:
+        # Line below has the side-effect of writing to a module level lookup
+        # table that will allow problems to render themselves. If this is not
+        # present, problems that a student hasn't seen will error when loading,
+        # causing the grading system to under-count the possible score and
+        # inflate their grade. This dependency is bad and was probably recently
+        # introduced. This is the bandage until we can trace the root cause.
+        m = MakoMiddleware()
 
         # Get basic auth (username/password) for
         # xqueue connection if it's in the settings
@@ -161,6 +170,10 @@ class XQueueCertInterface(object):
             cert, created = GeneratedCertificate.objects.get_or_create(
                    user=student, course_id=course_id)
 
+            # Needed
+            self.request.user = student
+            self.request.session = {}
+
             grade = grades.grade(student, self.request, course)
             is_whitelisted = self.whitelist.filter(
                 user=student, course_id=course_id, whitelist=True).exists()
@@ -211,5 +224,5 @@ class XQueueCertInterface(object):
         (error, msg) = self.xqueue_interface.send_to_queue(
                 header=xheader, body=json.dumps(contents))
         if error:
-            logger.critical('Unable to add a request to the queue')
+            logger.critical('Unable to add a request to the queue: {} {}'.format(error, msg))
             raise Exception('Unable to send queue message')

From 72aa56a45e0c0dc9632ec529501002b9dde23820 Mon Sep 17 00:00:00 2001
From: Alexander Kryklia <kryklia@gmail.com>
Date: Wed, 26 Jun 2013 13:00:15 +0300
Subject: [PATCH 2/2] updated CHANGELOG.rst

---
 CHANGELOG.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index cb8eec738f..6e3e02cd3c 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,10 @@ These are notable changes in edx-platform.  This is a rolling list of changes,
 in roughly chronological order, most recent first.  Add your entries at or near
 the top.  Include a label indicating the component affected.
 
+Common: Add tests for documentation generation to test suite
+
+Blades: User answer now preserved (and changeable) after clicking "show answer" in choice problems
+
 Blades: Small UX fix on capa multiple-choice problems.  Make labels only
 as wide as the text to reduce accidental choice selections.