Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
9563b4d2
Unverified
Commit
9563b4d2
authored
Oct 07, 2016
by
Brandon DeRosier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change content groups message when in a CCX
parent
8c3224b4
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
4 deletions
+12
-4
lms/djangoapps/instructor/views/instructor_dashboard.py
+2
-0
lms/static/js/groups/views/cohort_form.js
+2
-1
lms/static/js/groups/views/cohorts_dashboard_factory.js
+2
-1
lms/templates/instructor/instructor_dashboard_2/cohort-form.underscore
+5
-2
lms/templates/instructor/instructor_dashboard_2/cohort_management.html
+1
-0
No files found.
lms/djangoapps/instructor/views/instructor_dashboard.py
View file @
9563b4d2
...
...
@@ -486,10 +486,12 @@ def _section_membership(course, access, is_white_label):
def
_section_cohort_management
(
course
,
access
):
""" Provide data for the corresponding cohort management section """
course_key
=
course
.
id
ccx_enabled
=
hasattr
(
course_key
,
'ccx'
)
section_data
=
{
'section_key'
:
'cohort_management'
,
'section_display_name'
:
_
(
'Cohorts'
),
'access'
:
access
,
'ccx_is_enabled'
:
ccx_enabled
,
'course_cohort_settings_url'
:
reverse
(
'course_cohort_settings'
,
kwargs
=
{
'course_key_string'
:
unicode
(
course_key
)}
...
...
lms/static/js/groups/views/cohort_form.js
View file @
9563b4d2
...
...
@@ -35,7 +35,8 @@
cohort
:
this
.
model
,
isDefaultCohort
:
this
.
isDefault
(
this
.
model
.
get
(
'name'
)),
contentGroups
:
this
.
contentGroups
,
studioGroupConfigurationsUrl
:
this
.
context
.
studioGroupConfigurationsUrl
studioGroupConfigurationsUrl
:
this
.
context
.
studioGroupConfigurationsUrl
,
isCcxEnabled
:
this
.
context
.
isCcxEnabled
}));
return
this
;
},
...
...
lms/static/js/groups/views/cohorts_dashboard_factory.js
View file @
9563b4d2
...
...
@@ -31,7 +31,8 @@
discussionTopicsSettingsModel
:
discussionTopicsSettings
,
uploadCohortsCsvUrl
:
cohortManagementElement
.
data
(
'upload_cohorts_csv_url'
),
verifiedTrackCohortingUrl
:
cohortManagementElement
.
data
(
'verified_track_cohorting_url'
),
studioGroupConfigurationsUrl
:
studioGroupConfigurationsUrl
studioGroupConfigurationsUrl
:
studioGroupConfigurationsUrl
,
isCcxEnabled
:
cohortManagementElement
.
data
(
'is_ccx_enabled'
)
}
});
...
...
lms/templates/instructor/instructor_dashboard_2/cohort-form.underscore
View file @
9563b4d2
...
...
@@ -17,7 +17,6 @@
var cohort_name = cohort.get('name');
var cohort_name_value = isNewCohort ? '' : cohort_name;
var placeholder_value = isNewCohort ? gettext('Enter the name of the cohort') : '';
%>
<div class="form-field">
<div class="cohort-management-settings-form-name field field-text">
...
...
@@ -126,7 +125,11 @@
}
)
%>
<a class="link-to-group-settings" href="<%- studioGroupConfigurationsUrl %>"><%- gettext("Create a content group") %></a>
<% if (isCcxEnabled) { %>
<%- gettext("Only the parent course staff of a CCX can create content groups.") %>
<% } else { %>
<a class="link-to-group-settings" href="<%- studioGroupConfigurationsUrl %>"><%- gettext("Create a content group") %></a>
<% } %>
</p>
</div>
</div>
...
...
lms/templates/instructor/instructor_dashboard_2/cohort_management.html
View file @
9563b4d2
...
...
@@ -15,6 +15,7 @@ from openedx.core.djangoapps.course_groups.partition_scheme import get_cohorted_
data-course_cohort_settings_url=
"${section_data['course_cohort_settings_url']}"
data-discussion-topics-url=
"${section_data['discussion_topics_url']}"
data-verified_track_cohorting_url=
"${section_data['verified_track_cohorting_url']}"
data-is_ccx_enabled=
"${'true' if section_data['ccx_is_enabled'] else 'false'}"
>
</div>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment