Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
edx-platform-release
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
1
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Hsin-Yu Chien
edx-platform-release
Commits
2667d876
Unverified
Commit
2667d876
authored
4 years ago
by
Jansen Kantor
Committed by
GitHub
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
prevent max_team_size from exceeding 500 (#25267)
parent
13cb6d4c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cms/djangoapps/models/settings/course_metadata.py
+12
-5
12 additions, 5 deletions
cms/djangoapps/models/settings/course_metadata.py
cms/djangoapps/models/settings/tests/test_settings.py
+37
-1
37 additions, 1 deletion
cms/djangoapps/models/settings/tests/test_settings.py
with
49 additions
and
6 deletions
cms/djangoapps/models/settings/course_metadata.py
+
12
−
5
View file @
2667d876
...
...
@@ -295,9 +295,13 @@ class CourseMetadata(object):
return
errors
proposed_max_team_size
=
json_value
.
get
(
'
max_team_size
'
)
if
proposed_max_team_size
!=
''
and
proposed_max_team_size
is
not
None
and
proposed_max_team_size
<=
0
:
message
=
'
max_team_size must be greater than zero
'
errors
.
append
({
'
key
'
:
'
teams_configuration
'
,
'
message
'
:
message
,
'
model
'
:
teams_configuration_model
})
if
proposed_max_team_size
!=
''
and
proposed_max_team_size
is
not
None
:
if
proposed_max_team_size
<=
0
:
message
=
'
max_team_size must be greater than zero
'
errors
.
append
({
'
key
'
:
'
teams_configuration
'
,
'
message
'
:
message
,
'
model
'
:
teams_configuration_model
})
elif
proposed_max_team_size
>
500
:
message
=
'
max_team_size cannot be greater than 500
'
errors
.
append
({
'
key
'
:
'
teams_configuration
'
,
'
message
'
:
message
,
'
model
'
:
teams_configuration_model
})
proposed_topics
=
json_value
.
get
(
'
topics
'
)
...
...
@@ -343,8 +347,11 @@ class CourseMetadata(object):
if
teamset_type
not
in
valid_teamset_types
:
error_list
.
append
(
'
type
'
+
teamset_type
+
"
is invalid
"
)
max_team_size
=
topic_settings
.
get
(
'
max_team_size
'
,
{})
if
max_team_size
and
max_team_size
<=
0
:
error_list
.
append
(
'
max_team_size must be greater than zero
'
)
if
max_team_size
:
if
max_team_size
<=
0
:
error_list
.
append
(
'
max_team_size must be greater than zero
'
)
elif
max_team_size
>
500
:
error_list
.
append
(
'
max_team_size cannot be greater than 500
'
)
teamset_id
=
topic_settings
.
get
(
'
id
'
,
{})
if
not
teamset_id
:
error_list
.
append
(
'
id attribute must not be empty
'
)
...
...
This diff is collapsed.
Click to expand it.
cms/djangoapps/models/settings/tests/test_settings.py
+
37
−
1
View file @
2667d876
...
...
@@ -359,6 +359,40 @@ config_block_no_global_max_team_size = {
}
}
config_block_course_max_team_size
=
{
"
teams_configuration
"
:
{
"
value
"
:
{
"
max_team_size
"
:
501
,
"
topics
"
:
[
{
"
max_team_size
"
:
500
,
"
name
"
:
"
Topic 1 Name
"
,
"
id
"
:
"
topic_1_id
"
,
"
description
"
:
"
Topic 1 desc
"
,
"
type
"
:
"
public_managed
"
},
]
}
}
}
config_block_teamset_max_team_size
=
{
"
teams_configuration
"
:
{
"
value
"
:
{
"
max_team_size
"
:
500
,
"
topics
"
:
[
{
"
max_team_size
"
:
501
,
"
name
"
:
"
Topic 1 Name
"
,
"
id
"
:
"
topic_1_id
"
,
"
description
"
:
"
Topic 1 desc
"
,
"
type
"
:
"
public_managed
"
},
]
}
}
}
@ddt.ddt
class
TeamsConfigurationTests
(
unittest
.
TestCase
):
...
...
@@ -378,7 +412,9 @@ class TeamsConfigurationTests(unittest.TestCase):
(
config_block_missing_name
,
{
'
name attribute must not be empty
'
}),
(
config_block_extra_attribute
,
{
'
extra keys: foo
'
}),
(
config_block_unrecognized_teamset_type
,
{
'
type foo is invalid
'
}),
(
config_block_no_global_max_team_size
,
set
())
(
config_block_no_global_max_team_size
,
set
()),
(
config_block_course_max_team_size
,
{
'
max_team_size cannot be greater than 500
'
}),
(
config_block_teamset_max_team_size
,
{
'
max_team_size cannot be greater than 500
'
})
)
@ddt.unpack
def
test_team_settings
(
self
,
config_block
,
error_message
):
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment