Commit Graph

170 Commits

Author SHA1 Message Date
atesker
7e51f438e4 EDUCATOR-4903. Move defaults to correct place
EDUCATOR-4903. Move defaults to correct place - cr
2020-03-17 15:53:15 -04:00
Jansen Kantor
fe93f68163 EDUCATOR-4938: Teams Tab does not consider Teamset max_size (#23348)
* correctly resolve teamset-level and course-level max_team_size
2020-03-17 10:01:09 -04:00
atesker
2c922dd795 EDUCATOR-4941
cr1

cr2

cr3

cr3-remove unused var
2020-03-11 10:50:13 -04:00
Jansen Kantor
919dc5760a EDUCATOR-4918: Hide teams listing for team-sets with privacy enabled (#23293)
* pass teamset type existence flags to the teams tab view
2020-03-05 14:40:26 -05:00
atesker
f26ffb453b EDUCATOR-4943 - update error message
EDUCATOR-4943 - update error message. cr1

EDUCATOR-4943 - update error message. cr2

unit tests

readability
2020-03-05 12:32:39 -05:00
atesker
bf14bc97d2 EDUCATOR-4920 Control permission to REST endpoint
EDUCATOR-4920 Control permission to REST endpoint
CR1

EDUCATOR-4920 Control permission to REST endpoint
CR1
2020-03-03 16:04:31 -05:00
atesker
629b772172 EDUCATOR-4916 - additional error handling 2020-02-21 11:33:23 -05:00
Nathan Sprenkle
08269e8367 Before adding user to a team, check the organization protection status (#23134)
* Check learner enrollment status to avoid mixing learners from incompatible tracks (e.g. masters/audit) to the same team
* When a new team is encountered on a team management CSV, create it with the protection status of the user
2020-02-20 10:08:41 -05:00
Jansen Kantor
cec654f753 two csv upload team-creation bugs (#23036)
fix csv-upload bugs
2020-02-13 17:16:00 -05:00
Jansen Kantor
d4d6b33272 EDUCATOR-4879: Implement teams CSV GET endpoint (#23005)
* wip

* get

* quality

* change oauth2 to deprecated?

* quality

* remove duplicate enrollment check function

* code review
2020-02-06 15:06:23 -05:00
atesker
5a2d98b11d initial layout
interim commit

clean up

Initial unit tests and pylint

pylint cleanup

Unit tests extended and passing. Pylint

WIP - fix Unit tests extended and passing. Pylint

Updated logic to validate before commit.

CR pass1

CR pass1, pep8

pep8 2

interim cr

interim cr2

refactor to using DictReader

removed uneeded mixin

pr comments

encoding fix and return value

Cache teams/membershipos

ncr

cr aed
2020-02-04 13:52:51 -05:00
Nathan Sprenkle
62d5ff49a0 EDCUATOR-4810: Add team anonymous ID lookup (#22868)
* Add ability for team-members to look up each other's anonymous user IDs for team assignments
2020-01-30 09:50:47 -05:00
Jansen Kantor
25baa93af9 EDUCATOR-4877: Implement stubbed API functions using new config values (#22913)
add stubbed api functions, tests
2020-01-24 15:54:32 -05:00
Jansen Kantor
b2f69fc803 EDUCATOR-4858: Update teams service to consider teamset/topic (#22834)
* update teams service and api to consider topic
2020-01-14 16:06:27 -05:00
Feanil Patel
2df8b8226b Merge pull request #22643 from edx/feanil/2to3_asserts
Run `2to3 -f asserts . -w` on edx-platform.
2019-12-30 12:13:42 -05:00
Feanil Patel
9cf2f9f298 Run 2to3 -f future . -w
This will remove imports from __future__ that are no longer needed.

https://docs.python.org/3.5/library/2to3.html#2to3fixer-future
2019-12-30 10:35:30 -05:00
Feanil Patel
70294b0ad2 Run 2to3 -f asserts . -w on edx-platform.
https://docs.python.org/3.5/library/2to3.html#2to3fixer-asserts
2019-12-30 10:22:19 -05:00
Jansen Kantor
92e833d565 add api function and teams service (#22515)
* add api function and teams service
2019-12-18 15:05:02 -05:00
Alex Wang
f1d2ddc97a no student create team in instructor managed topic (#22432)
Students can't create team in an instructor-managed topic
2019-12-06 13:41:56 -05:00
Kyle McCormick
dcf5d70bc4 Create UI for CSV team management (#22310)
Adds "Manage" sub-tab to course "Teams" tab
with UI for downloading and uploading team
membership CSVs. The upload and download function-
ality are currently not implemented.

The new tab only appears when the user is course staff
and the course has at least one instructor-managed
team-set, which is not the case for any existing
courses, so not current course staff will see this
change.

This ticket will be followed-up upon in MST-44 and
MST-49.

MST-41
2019-12-02 11:27:05 -05:00
Alex Wang
d044ed28b5 Student can NOT modify membership status with team in instructor managed topic (#22286)
* no student change to instructor managed team

* Address comments & fix unit tests

* fix jenkins test failure

* Fix eslint errors

* Fix xss warnings

* Fix bokchoy test
2019-11-25 19:59:51 -05:00
Simon Chen
c5f03adb0e Add the organization protected attribute to team
This is needed so Masters learners will not be in the same team as verfied and audit learners. If the team is designated as organization protected, it will not be visible or accessible by verified or audit track learners
MST-34
2019-11-12 13:03:55 -05:00
Kyle McCormick
4f3262a40b Remove most references to old teams config scheme (#22238)
This is a follow up from MST-16, which was commited
in 3858036a4e.

Changes:
* Enrich course teams_configuration from a plain Dict
  to a custom XBlock field that uses the new TeamsConfig
  wrapper class.
* Remove teams_conf property from course, as the previous
  change made it redundant.
* Update teams_enabled implementation.
* Remove teams_max_size field from course, which is
  no longer semantically correct, as max team size
  is now defined on a teamset level.
* Remove teams_topics in order to discourage use of raw
  teams config dict.
* Add convenience properties teamsets and teamsets_by_id
  to course.
* Allow periods and spaces in teamset IDs to avoid breaking
  existing course teams.

Some parts of the code still use the old raw config data
(identifiable by searching "cleaned_data_old_format"),
which we expect to be slowly factored away as we build
new teams features. MST-40 has been created to remove any
remaining references if necessary.

MST-18

* fix: bokchoy test

* fix: remove pdb break
2019-11-06 20:43:32 -05:00
Kyle McCormick
7dbee1c3dd Ensure Python 3 compatibility of Teams djangoapp (#22096)
* For all files, from __future__ import unicode_literals.
* Add @python_2_unicode_compatible to both models.
* Test six.string_type(obj) for both models.

Also, fix some new pylint warnings and improve model repr methods.

MST-24
2019-10-22 13:42:27 -04:00
Kyle McCormick
cd3bc236eb Make the team discussion thread private
Develop the capability to allow instructors to designate teams to have private discussions. This way, so non-teammembers cannot view discussion. And the intend is for course teams to manage the team membership as well.
MST-10
2019-10-18 13:06:50 -04:00
Alex Wang
77eb01ff42 resolve pylint violations in lms/djangoapps/teams (#22063)
MST-6
2019-10-18 10:20:55 -04:00
Nimisha Asthagiri
a6b219a9e9 Python-3: assertIn(..response.content) -> assertContains 2019-09-30 08:50:38 -04:00
Ned Batchelder
efba6e45e8 Finally import courseware properly everywhere to get rid of a warning 2019-09-26 09:40:15 -04:00
David Ormsbee
9a1385585f Convert response bytes to str before JSON parsing. (#21375)
Convert response bytes to str before JSON parsing.
2019-08-19 11:01:55 -04:00
Stu Young
272751c821 incr-300 (#20624)
* run python modernize

* run isort

* Fix imports
2019-05-16 11:12:37 -04:00
Nimisha Asthagiri
dfa3728edf Move django_comment_common from common to openedx 2019-05-03 12:10:18 -04:00
Nimisha Asthagiri
ef0e06cc0a Revert "Discussions consolidation" 2019-05-02 14:59:56 -04:00
Nimisha Asthagiri
df962a31b7 Move django_comment_common to openedx/core/djangoapps/discussion_common 2019-05-01 19:15:02 -04:00
cclauss
44d62fac75 Fix explicit tuple parameters for Python 3 2019-02-19 12:37:34 +01:00
Calen Pennington
8c53ce6493 Merge pull request #19743 from edx/unicode7
fix unicode strings in lms/ part 2
2019-02-13 14:15:02 -05:00
Matthew Piatetsky
764319d3e0 fix unicode strings in lms/ part 2 2019-02-13 10:35:56 -05:00
Michael Youngstrom
3221c2b91f Remove lms pytest shards 2019-02-12 11:03:46 -05:00
Ned Batchelder
8acea435cf setUpClassAndTestData is tricker than pylint understands 2018-11-02 11:06:59 -04:00
Jeremy Bowman
68902a2f3f TE-2689 Remove useless pylint suppressions part 3 2018-08-16 09:57:01 -04:00
Jeremy Bowman
4e8668d3be TE-2524 Stop using nose.plugins - LMS 2 2018-08-01 13:54:06 -04:00
Brian Mesick
832f6a7157 Merge pull request #18320 from edx/bmedx/remove_111_test_marks
Remove unused pytest markers for Django 1.11 upgrade
2018-06-06 11:15:26 -04:00
bmedx
c125ff6a57 Remove unused pytest markers for Django 1.11 upgrade 2018-06-06 09:58:38 -04:00
Eric Fischer
247bb50ed2 s/django.core.urlresolvers/django.urls/g
Django 1.10 deprecation fix for Hackathon XIX
Addresses PLAT-1397
2018-06-05 13:59:09 -04:00
Stuart Young
1fd2167144 rebalance python unittests onto new shards 2018-05-03 11:16:05 -04:00
bmedx
5fbbf4979a Tag LMS Unit 1 tests that fail in Django 1.11 2017-11-22 15:46:45 -05:00
Jeremy Bowman
fd6af6b05e ddt usage cleanup 2017-09-05 17:25:51 -04:00
Andy Armstrong
79acb5c5be Reorder LMS imports using isort 2017-06-11 21:48:06 -04:00
Jeff LaJoie
d66e323d42 TNL-6186 changes field used in CourseTeamMembership emit to be correct team_id and fixes tests 2017-01-06 08:10:31 -05:00
Calen Pennington
bc20a37c2b Simplify how shards are selected in CI 2016-08-03 16:23:02 -04:00
John Eskew
b777530dac Add SharedModuleStoreTestCase.setUpClassAndTestData() context manager
for use when a test class has a setUpTestData() method which uses
variables set up in the setUpClass() method.
Change base teams API test class to use the context manager.
2016-02-29 18:02:57 -05:00