Commit f6ed874a by Rocky Duan

fixed permalink

parent ba7a0b68
...@@ -155,7 +155,7 @@ def render_single_thread(request, discussion_id, course_id, thread_id): ...@@ -155,7 +155,7 @@ def render_single_thread(request, discussion_id, course_id, thread_id):
context = { context = {
'discussion_id': discussion_id, 'discussion_id': discussion_id,
'thread': thread, 'thread': thread,
'user_info': cc.User.from_django_user(request.user).to_dict(), 'user_info': json.dumps(cc.User.from_django_user(request.user).to_dict()),
'annotated_content_info': json.dumps(annotated_content_info), 'annotated_content_info': json.dumps(annotated_content_info),
'course_id': course_id, 'course_id': course_id,
'request': request, 'request': request,
......
<%namespace name="renderer" file="_thread.html"/> <%namespace name="renderer" file="_thread.html"/>
<%! from django.template.defaultfilters import escapejs %>
<section class="discussion forum-discussion" _id="${discussion_id}"> <section class="discussion forum-discussion" _id="${discussion_id}">
...@@ -29,10 +30,10 @@ ...@@ -29,10 +30,10 @@
%> %>
<script type="text/javascript"> <script type="text/javascript">
var $$user_info = JSON.parse('${user_info | escape_quotes}'); var $$user_info = JSON.parse("${user_info | escapejs}");
var $$course_id = "${course_id}"; var $$course_id = "${course_id | escapejs}";
if (typeof $$annotated_content_info === undefined || $$annotated_content_info === null) { if (typeof $$annotated_content_info === undefined || $$annotated_content_info === null) {
var $$annotated_content_info = {}; var $$annotated_content_info = {};
} }
$$annotated_content_info = $.extend($$annotated_content_info, JSON.parse("${annotated_content_info | escape_quotes}")); $$annotated_content_info = $.extend($$annotated_content_info, JSON.parse("${annotated_content_info | escapejs}"));
</script> </script>
<%namespace name="renderer" file="_thread.html"/> <%namespace name="renderer" file="_thread.html"/>
<%! from django.template.defaultfilters import escapejs %>
<section class="discussion"> <section class="discussion" _id="${discussion_id}">
<a class="discussion-title" href="javascript:void(0)">Discussion</a> <a class="discussion-title" href="javascript:void(0)">Discussion</a>
${renderer.render_thread(course_id, thread, show_comments=True)} ${renderer.render_thread(course_id, thread, show_comments=True)}
</section> </section>
<%!
def escape_quotes(text):
return text.replace('\"', '\\\"').replace("\'", "\\\'")
%>
<script type="text/javascript"> <script type="text/javascript">
var $$user_info = JSON.parse('${user_info | escape_quotes}'); var $$user_info = JSON.parse("${user_info | escapejs}");
var $$course_id = "${course_id}"; var $$course_id = "${course_id | escapejs}";
if (typeof $$annotated_content_info === undefined || $$annotated_content_info === null) { if (typeof $$annotated_content_info === undefined || $$annotated_content_info === null) {
var $$annotated_content_info = {}; var $$annotated_content_info = {};
} }
$$annotated_content_info = $.extend($$annotated_content_info, JSON.parse("${annotated_content_info | escape_quotes}")); $$annotated_content_info = $.extend($$annotated_content_info, JSON.parse("${annotated_content_info | escapejs}"));
</script> </script>
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