Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Attach the discussion_id to posts made from the embedded discussion forum.

Browse Source
This commit is contained in:
Ibrahim Awwal
2012-09-06 02:11:47 -07:00
parent 00d21acd79
commit 2811822b93
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lms/static/coffee/src/discussion/discussion_module_view.coffee
View File

@@ -26,23 +26,23 @@ if Backbone?
@showed = true
else
$elem = $(event.target)
discussion_id = $elem.attr("discussion_id")
url = DiscussionUtil.urlFor 'retrieve_discussion', discussion_id
discussionId = $elem.data("discussion-id")
url = DiscussionUtil.urlFor 'retrieve_discussion', discussionId
DiscussionUtil.safeAjax
$elem: $elem
$loading: $elem
url: url
type: "GET"
dataType: 'json'
success: (response, textStatus, jqXHR) => @createDiscussion(event, response, textStatus)
success: (response, textStatus, jqXHR) => @createDiscussion(event, response, textStatus, discussionId)
createDiscussion: (event, response, textStatus) =>
createDiscussion: (event, response, textStatus, discussionId) =>
window.user = new DiscussionUser(response.user_info)
Content.loadContentInfos(response.annotated_content_info)
$(event.target).html("Hide Discussion")
@discussion = new Discussion()
@discussion.reset(response.discussion_data, {silent: false})
$discussion = $(Mustache.render $("script#_inline_discussion").html(), {'threads':response.discussion_data})
$discussion = $(Mustache.render $("script#_inline_discussion").html(), {'threads':response.discussion_data, 'discussionId': discussionId})
$(".discussion-module").append($discussion)
@newPostForm = $('.new-post-article')
@threadviews = @discussion.map (thread) ->

2
lms/static/coffee/src/discussion/views/new_post_inline_vew.coffee
View File

@@ -2,7 +2,7 @@ class @NewPostInlineView extends Backbone.View
initialize: () ->
@topicId = @$(".topic").first().data("discussion_id")
@topicId = @$(".topic").first().data("discussion-id")
@maxNameWidth = 100

2
lms/templates/discussion/_discussion_module.html
View File

@@ -1,5 +1,5 @@
<%include file="_underscore_templates.html" />
<div class="discussion-module">
<a class="discussion-show control-button" href="javascript:void(0)" discussion_id="${discussion_id | h}">Show Discussion</a>
<a class="discussion-show control-button" href="javascript:void(0)" data-discussion-id="${discussion_id | h}">Show Discussion</a>
</div>

3
lms/templates/discussion/mustache/_inline_discussion.mustache
View File

@@ -1,7 +1,8 @@
<section class="discussion">
<section class="discussion" data-discussion-id="{{discussionId}}">
<a href="#" class="new-post-btn"><span class="new-post-icon"></span>New Post</a>
<article class="new-post-article">
<span class="topic" data-discussion-id="{{discussionId}}" />
<div class="inner-wrapper">
<div class="new-post-form-errors">
</div>