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
f4c9044d
Commit
f4c9044d
authored
Jun 09, 2017
by
Brandon Baker
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
EDUCATOR-344
Removed instances of track function
parent
ec9ad2cc
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
9 additions
and
13 deletions
+9
-13
common/lib/xmodule/xmodule/partitions/partitions_service.py
+2
-3
common/lib/xmodule/xmodule/partitions/tests/test_partitions.py
+1
-2
lms/djangoapps/courseware/tests/test_group_access.py
+1
-1
lms/djangoapps/instructor_task/tests/test_integration.py
+1
-1
lms/djangoapps/lms_xblock/runtime.py
+0
-1
openedx/core/djangoapps/course_groups/partition_scheme.py
+1
-1
openedx/core/djangoapps/user_api/partition_schemes.py
+3
-4
No files found.
common/lib/xmodule/xmodule/partitions/partitions_service.py
View file @
f4c9044d
...
...
@@ -87,9 +87,8 @@ class PartitionService(object):
with a given course.
"""
def
__init__
(
self
,
course_id
,
track_function
=
None
,
cache
=
None
):
def
__init__
(
self
,
course_id
,
cache
=
None
):
self
.
_course_id
=
course_id
self
.
_track_function
=
track_function
self
.
_cache
=
cache
def
get_course
(
self
):
...
...
@@ -165,7 +164,7 @@ class PartitionService(object):
the partition's scheme.
"""
return
user_partition
.
scheme
.
get_group_for_user
(
self
.
_course_id
,
user
,
user_partition
,
assign
=
assign
,
track_function
=
self
.
_track_function
self
.
_course_id
,
user
,
user_partition
,
assign
=
assign
,
)
...
...
common/lib/xmodule/xmodule/partitions/tests/test_partitions.py
View file @
f4c9044d
...
...
@@ -96,7 +96,7 @@ class MockUserPartitionScheme(object):
self
.
name
=
name
self
.
current_group
=
current_group
def
get_group_for_user
(
self
,
course_id
,
user
,
user_partition
,
assign
=
True
,
track_function
=
None
):
# pylint: disable=unused-argument
def
get_group_for_user
(
self
,
course_id
,
user
,
user_partition
,
assign
=
True
):
# pylint: disable=unused-argument
"""
Returns the current group if set, else the first group from the specified user partition.
"""
...
...
@@ -446,7 +446,6 @@ class PartitionServiceBaseClass(PartitionTestCase):
return
MockPartitionService
(
self
.
course
,
course_id
=
self
.
course
.
id
,
track_function
=
Mock
(),
cache
=
cache
)
...
...
lms/djangoapps/courseware/tests/test_group_access.py
View file @
f4c9044d
...
...
@@ -31,7 +31,7 @@ class MemoryUserPartitionScheme(object):
"""
self
.
current_group
.
setdefault
(
user
.
id
,
{})[
user_partition
.
id
]
=
group
def
get_group_for_user
(
self
,
course_id
,
user
,
user_partition
,
track_function
=
None
):
# pylint: disable=unused-argument
def
get_group_for_user
(
self
,
course_id
,
user
,
user_partition
):
# pylint: disable=unused-argument
"""
Fetch the group to which this user is linked in this partition, or None.
"""
...
...
lms/djangoapps/instructor_task/tests/test_integration.py
View file @
f4c9044d
...
...
@@ -604,7 +604,7 @@ class TestGradeReportConditionalContent(TestReportMixin, TestConditionalContent,
group_config_hdr_tpl
=
'Experiment Group ({})'
return
{
group_config_hdr_tpl
.
format
(
self
.
partition
.
name
):
self
.
partition
.
scheme
.
get_group_for_user
(
self
.
course
.
id
,
user
,
self
.
partition
,
track_function
=
None
self
.
course
.
id
,
user
,
self
.
partition
)
.
name
}
...
...
lms/djangoapps/lms_xblock/runtime.py
View file @
f4c9044d
...
...
@@ -140,7 +140,6 @@ class LmsModuleSystem(ModuleSystem): # pylint: disable=abstract-method
services
[
'library_tools'
]
=
LibraryToolsService
(
modulestore
())
services
[
'partitions'
]
=
PartitionService
(
course_id
=
kwargs
.
get
(
'course_id'
),
track_function
=
kwargs
.
get
(
'track_function'
,
None
),
cache
=
request_cache_dict
)
store
=
modulestore
()
...
...
openedx/core/djangoapps/course_groups/partition_scheme.py
View file @
f4c9044d
...
...
@@ -25,7 +25,7 @@ class CohortPartitionScheme(object):
# pylint: disable=unused-argument
@classmethod
def
get_group_for_user
(
cls
,
course_key
,
user
,
user_partition
,
track_function
=
None
,
use_cached
=
True
):
def
get_group_for_user
(
cls
,
course_key
,
user
,
user_partition
,
use_cached
=
True
):
"""
Returns the Group from the specified user partition to which the user
is assigned, via their cohort membership and any mappings from cohorts
...
...
openedx/core/djangoapps/user_api/partition_schemes.py
View file @
f4c9044d
...
...
@@ -19,7 +19,7 @@ class NotImplementedPartitionScheme(object):
"""
@classmethod
def
get_group_for_user
(
cls
,
course_key
,
user
,
user_partition
,
assign
=
True
,
track_function
=
None
):
# pylint: disable=unused-argument
def
get_group_for_user
(
cls
,
course_key
,
user
,
user_partition
,
assign
=
True
):
# pylint: disable=unused-argument
"""
Returning None is equivalent to saying "This user is not in any groups
using this partition scheme", be sure the scheme you're removing is
...
...
@@ -33,7 +33,7 @@ class ReturnGroup1PartitionScheme(object):
This scheme is needed to allow verification partitions to be killed, see EDUCATOR-199
"""
@classmethod
def
get_group_for_user
(
cls
,
course_key
,
user
,
user_partition
,
assign
=
True
,
track_function
=
None
):
# pylint: disable=unused-argument
def
get_group_for_user
(
cls
,
course_key
,
user
,
user_partition
,
assign
=
True
):
# pylint: disable=unused-argument
"""
The previous "allow" definition for verification was defined as 1, so return that.
Details at https://github.com/edx/edx-platform/pull/14913/files#diff-feff1466ec4d1b8c38894310d8342a80
...
...
@@ -48,7 +48,7 @@ class RandomUserPartitionScheme(object):
RANDOM
=
random
.
Random
()
@classmethod
def
get_group_for_user
(
cls
,
course_key
,
user
,
user_partition
,
assign
=
True
,
track_function
=
None
):
def
get_group_for_user
(
cls
,
course_key
,
user
,
user_partition
,
assign
=
True
):
"""
Returns the group from the specified user position to which the user is assigned.
If the user has not yet been assigned, a group will be randomly chosen for them if assign flag is True.
...
...
@@ -85,7 +85,6 @@ class RandomUserPartitionScheme(object):
# persist the value as a course tag
course_tag_api
.
set_course_tag
(
user
,
course_key
,
partition_key
,
group
.
id
)
if
track_function
:
# emit event for analytics
# FYI - context is always user ID that is logged in, NOT the user id that is
# being operated on. If instructor can move user explicitly, then we should
...
...
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