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

Merge branch 'release'

Browse Source 
Conflicts:
	lms/static/coffee/src/instructor_dashboard/membership.coffee
	lms/templates/instructor/instructor_dashboard_2/membership.html
	requirements/edx/github.txt
This commit is contained in:
Diana Huang
2014-04-16 15:41:59 -04:00
parent afd827718d 3a7c3e7c01
commit 79fea6205e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/static/coffee/src/instructor_dashboard/membership.coffee
View File

@@ -180,8 +180,8 @@ class BetaTesterBulkAddition
# gather elements
@$identifier_input = @$container.find("textarea[name='student-ids-for-beta']")
@$btn_beta_testers = @$container.find("input[name='beta-testers']")
@$checkbox_emailstudents = @$container.find("input[name='email-students']")
@$checkbox_autoenroll = @$container.find("input[name='auto-enroll']")
@$checkbox_emailstudents = @$container.find("input[name='email-students-beta']")
@$task_response = @$container.find(".request-response")
@$request_response_error = @$container.find(".request-response-error")
@@ -278,7 +278,7 @@ class BatchEnrollment
# attach click handler for enrollment buttons
@$enrollment_button.click =>
emailStudents: @$checkbox_emailstudents.is(':checked')
emailStudents = @$checkbox_emailstudents.is(':checked')
send_data =
action: $(event.target).data('action') # 'enroll' or 'unenroll'
identifiers: @$identifier_input.val()

2
lms/templates/instructor/instructor_dashboard_2/membership.html
View File

@@ -95,7 +95,7 @@
</div>
<div class="enroll-option">
<input type="checkbox" name="email-students" value="Notify-students-by-email" checked="yes">
<input type="checkbox" name="email-students-beta" value="Notify-students-by-email" checked="yes">
<label for="email-students-beta">${_("Notify users by email")}</label>
<div class="hint email-students-beta-hint">
<span class="hint-caret"></span>