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

Merge pull request #11126 from edx/carol/doc/cohort_help_target

Browse Source 
Fix cohort doc help targets in Instructor Dashboard
This commit is contained in:
Carol Tong
2016-01-04 17:02:31 -05:00
parent c6ed893df9 0f3da297f6
commit e7dab0dfbb
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/test/acceptance/tests/discussion/test_cohort_management.py
View File

@@ -88,12 +88,12 @@ class CohortConfigurationTest(EventsTestMixin, UniqueCourseTest, CohortTestMixin
""" """
self.verify_cohort_description( self.verify_cohort_description(
self.manual_cohort_name, self.manual_cohort_name,
'Students are added to this cohort only when you provide ' 'Learners are added to this cohort only when you provide '
'their email addresses or usernames on this page', 'their email addresses or usernames on this page',
) )
self.verify_cohort_description( self.verify_cohort_description(
self.auto_cohort_name, self.auto_cohort_name,
'Students are added to this cohort automatically', 'Learners are added to this cohort automatically',
) )
def test_no_content_groups(self): def test_no_content_groups(self):

5
lms/static/js/spec/groups/views/cohorts_spec.js
View File

@@ -240,8 +240,9 @@ define(['backbone', 'jquery', 'common/js/spec_helpers/ajax_helpers', 'common/js/
) )
); );
assignmentType = assignmentType || MOCK_MANUAL_ASSIGNMENT; assignmentType = assignmentType || MOCK_MANUAL_ASSIGNMENT;
var manualMessage = "Students are added to this cohort only when you provide their email addresses or usernames on this page."; var manualMessage = "Learners are added to this cohort only when you provide their email addresses " +
var randomMessage = "Students are added to this cohort automatically."; "or usernames on this page.";
var randomMessage = "Learners are added to this cohort automatically.";
var message = (assignmentType == MOCK_MANUAL_ASSIGNMENT) ? manualMessage : randomMessage; var message = (assignmentType == MOCK_MANUAL_ASSIGNMENT) ? manualMessage : randomMessage;
expect(header.find('.cohort-management-group-setup .setup-value').text().trim().split('\n')[0]).toBe(message); expect(header.find('.cohort-management-group-setup .setup-value').text().trim().split('\n')[0]).toBe(message);
}; };

8
lms/templates/instructor/instructor_dashboard_2/cohort-group-header.underscore
View File

@@ -11,11 +11,11 @@
<div class="cohort-management-group-setup"> <div class="cohort-management-group-setup">
<div class="setup-value"> <div class="setup-value">
<% if (cohort.get('assignment_type') == "manual") { %> <% if (cohort.get('assignment_type') == "manual") { %>
<%- gettext("Students are added to this cohort only when you provide their email addresses or usernames on this page.") %> <%- gettext("Learners are added to this cohort only when you provide their email addresses or usernames on this page.") %>
<a href="http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/cohorts/cohort_config.html#assign-students-to-cohort-groups-manually" class="incontext-help action-secondary action-help"><%= gettext("What does this mean?") %></a> <a href="http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/course_features/cohorts/cohort_config.html#assign-learners-to-cohorts-manually" class="incontext-help action-secondary action-help"><%= gettext("What does this mean?") %></a>
<% } else { %> <% } else { %>
<%- gettext("Students are added to this cohort automatically.") %> <%- gettext("Learners are added to this cohort automatically.") %>
<a href="http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/cohorts/cohorts_overview.html#all-automated-assignment" class="incontext-help action-secondary action-help"><%- gettext("What does this mean?") %></a> <a href="http://edx.readthedocs.org/projects/edx-partner-course-staff/en/latest/course_features/cohorts/cohorts_overview.html#all-automated-assignment" class="incontext-help action-secondary action-help"><%- gettext("What does this mean?") %></a>
<% } %> <% } %>
</div> </div>
</div> </div>