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
5e14a356
Commit
5e14a356
authored
Apr 19, 2017
by
cahrens
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change "Choose one" to "Select a group type".
parent
bd2025d6
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
cms/static/js/xblock/authoring.js
+1
-1
cms/templates/visibility_editor.html
+1
-1
common/test/acceptance/tests/studio/test_studio_container.py
+2
-2
No files found.
cms/static/js/xblock/authoring.js
View file @
5e14a356
...
...
@@ -14,7 +14,7 @@
// Get the selected user partition (only allowed to select one).
partitionId
=
parseInt
(
element
.
find
(
'.partition-visibility select'
).
val
(),
10
);
// "All Learners and Staff" is selected (or "
Choose on
e", which is only shown when
// "All Learners and Staff" is selected (or "
Select a group typ
e", which is only shown when
// current visibility is "All Learners and Staff" at the time the dialog is opened).
if
(
partitionId
===
-
1
)
{
return
{};
...
...
cms/templates/visibility_editor.html
View file @
5e14a356
...
...
@@ -67,7 +67,7 @@ is_staff_locked = ancestor_has_staff_lock(xblock)
<select>
<option
value=
"-1"
selected =
"selected"
>
% if selected_partition_index == -1:
${_('
Choose on
e')}
${_('
Select a group typ
e')}
% else:
${_('All Learners and Staff')}
% endif
...
...
common/test/acceptance/tests/studio/test_studio_container.py
View file @
5e14a356
...
...
@@ -319,7 +319,7 @@ class EditContainerTest(NestedVerticalTest):
class
BaseGroupConfigurationsTest
(
ContainerBase
):
ALL_LEARNERS_AND_STAFF
=
ComponentVisibilityEditorView
.
ALL_LEARNERS_AND_STAFF
CHOOSE_ONE
=
"
Choose on
e"
CHOOSE_ONE
=
"
Select a group typ
e"
CONTENT_GROUP_PARTITION
=
ComponentVisibilityEditorView
.
CONTENT_GROUP_PARTITION
ENROLLMENT_TRACK_PARTITION
=
ComponentVisibilityEditorView
.
ENROLLMENT_TRACK_PARTITION
MISSING_GROUP_LABEL
=
'Deleted Group
\n
This group no longer exists. Choose another group or make this component visible to All Learners and Staff.'
...
...
@@ -405,7 +405,7 @@ class BaseGroupConfigurationsTest(ContainerBase):
visibility_editor
.
select_groups_in_partition_scheme
(
partition_label
,
groups
)
# Re-open the modal and inspect its selected inputs. If no groups were selected,
# "All Learners" should be selected partitions scheme, and we show "
Choose on
e" in the select.
# "All Learners" should be selected partitions scheme, and we show "
Select a group typ
e" in the select.
if
not
groups
:
partition_label
=
self
.
CHOOSE_ONE
visibility_editor
=
self
.
edit_component_visibility
(
component
)
...
...
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