summaryrefslogtreecommitdiff
path: root/server/user_session.py
diff options
context:
space:
mode:
Diffstat (limited to 'server/user_session.py')
-rw-r--r--server/user_session.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/server/user_session.py b/server/user_session.py
index a463903..8b76e0a 100644
--- a/server/user_session.py
+++ b/server/user_session.py
@@ -66,6 +66,12 @@ class UserSession(object):
def get_problem_data(self, language, problem_group, problem):
mod = problems.load_problem(language, problem_group, problem, 'en')
+ mod_language = problems.load_language(language, 'en')
+
+ # Get generic and problem-specific hints.
+ hint = dict(mod_language.hint)
+ hint.update(mod.hint)
+
conn = db.get_connection()
try:
cur = conn.cursor()
@@ -76,7 +82,7 @@ class UserSession(object):
result = {
'language': {'id': row[0], 'identifier': language, 'name': row[1]},
'problem_group': {'id': row[2], 'identifier': problem_group, 'name': row[3]},
- 'problem': {'id': problem_id, 'identifier': problem, 'name': row[5], 'slug': mod.slug, 'description': mod.description, 'hint': mod.hint}
+ 'problem': {'id': problem_id, 'identifier': problem, 'name': row[5], 'slug': mod.slug, 'description': mod.description, 'hint': hint}
}
cur.execute("select content from solution where problem_id = %s and codeq_user_id = %s", (problem_id, self.uid))
row = cur.fetchone()