Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,867 Commits 1 Branch 0 Tags
c40aa67fd043b42ecc05cb31cc82cd5d00a7f094
Commit Graph

149 Commits

Author SHA1 Message Date
Jansen Kantor
5c0fd63f13 emit an event when removing users from teams via csv (#24271) 2020-06-22 14:25:05 -04:00
atesker
34171e6d6e Disallow the condition of trying to add a master's learner to a non-protected team. 2020-06-22 09:20:32 -04:00
Nathan Sprenkle
5cedc64f41 Correct team count for private team-sets in Teams tab (#24216) 
* Hide private team-sets from users not on a team

* Modify add team count to factor in team visibility

* Fix bug that broke search w/in private team-sets
 2020-06-18 15:21:58 -04:00
Jansen Kantor
7e459c7228 EDUCATOR-5069: Display student key in csv export (#24235) 
* use external_user_key in teams csv download
 2020-06-18 12:13:06 -04:00
Nathan Sprenkle
44b0d832a0 Scope team search to course when removing from team (#24174) 2020-06-10 10:03:27 -04:00
Nathan Sprenkle
e0ddb1e0e2 Team Assignments Dashboard (#24019) 
* Add team assignments to frontend

* Limit team assignments to the given teamset

* Remove deprecated django render_to_response

* Move team assignments panel behind feature flag
 2020-06-02 15:05:47 -04:00
atesker
de0e8524a2 EDUCATOR 5065 - updates 
EDUCATOR 5065 - CR comments 3
 2020-06-02 14:03:01 -04:00
Ali Akbar
27b0e8d845 Merge pull request #23983 from edx/aakbar/PROD-1362 
fix admin unable to delete course team
 2020-05-22 13:08:03 +05:00
Ali-D-Akbar
32d4b2dae6 fix admin unable to delete course team 
modify delete team unit test for admin

test improvements

test improvements

test improvements

test improvements

add team unauthorized access test

add team unauthorized and forbidden access test
 2020-05-22 12:34:47 +05:00
Ben Warzeski
ee6eac546b Test non-ascii utf-8 character team member name upload. (#24009) 
* remove old_format reference in teams config

* validate uploaded character values for team csv upload

Co-authored-by: Ben Warzeski <benwarzeski@edX-C02CD0HCLVDM.cable.rcn.com>
 2020-05-20 12:13:27 -04:00
Ben Warzeski
1703a88d46 remove old_format from team config tests (#24010) 
* remove old_format from team config tests

* remove old format from teams_config

Co-authored-by: Ben Warzeski <benwarzeski@edX-C02CD0HCLVDM.cable.rcn.com>
 2020-05-20 08:56:46 -04:00
atesker
cfff2a86aa EDUCATOR-5053 2020-05-19 12:07:05 -04:00
Jansen Kantor
9707dcff6e EDUCATOR 5042: Learner's Private Team Appears When Learner Browses all Team Sets (#24004) 
* fix query to remove dulicates and incorrect teams
 2020-05-15 16:50:31 -04:00
Ben Warzeski
7778347aed remove old_format from team config tests 2020-05-15 14:44:23 -04:00
atesker
839a0edc4e EDUCATOR-4989 - use student-key 2020-05-13 13:07:31 -04:00
atesker
5462a176a8 EDUCATOR-4990 - Modify team membership via CSV upload. Slight refactoring - removal happens post static validation 2020-05-07 16:23:23 -04:00
Jansen Kantor
a9beda2c20 404 if user does not have access to topic (#23638) 2020-04-09 14:13:12 -04:00
Jansen Kantor
933cb490f2 EDUCATOR-5001: Don't return private teamsets unless user has access to them (#23612) 
* hide 'hidden' teamsets from topic listing endpoint
 2020-04-09 13:30:05 -04:00
Jansen Kantor
e8d4f93635 eamMembershipListView POST should return 404 when user tries to join team they do not have access to (#23654) 2020-04-08 11:22:52 -04:00
Jansen Kantor
261a7cbbfc TeamMembershipDetailView should return 404 when user tries to join team they do not have access to (#23653) 2020-04-08 11:22:21 -04:00
Jansen Kantor
90885e4193 create team view teamset privacy fixes (#23607) 2020-04-07 22:04:23 -04:00
Jansen Kantor
1b2e10d96e add HasSpecificTeamAccess permission and change tests (#23608) 2020-04-07 21:21:14 -04:00
Jansen Kantor
480642e8c4 EDUCATOR-4995: text search returns private teamsets for anyone in bubble (#23586) 
* Manually exclude private_managed teams from text search results
 2020-04-07 21:13:42 -04:00
Jansen Kantor
6b9d4e49b3 EDUCATOR-4976 (Part 2): Tests for current behavior (#23567) 
* tests for current teams api view behavior
 2020-04-07 18:30:53 -04:00
Jansen Kantor
c096464a3c EDUCATOR-4976 (Part 1): Add teamset type validation to has_specific_team_access (#23539) 
Add teamset type validation to has_specific_team_access
 2020-04-01 16:40:03 -04:00
Manjinder Singh
b1baf5db77 Converting variable to string before assignment in tests (#23546) 
* Converting variable to string before assignment in tests

Django 2 is stricter of string typing, so it will no longer do implicit conversions in some cases.
While the release notes only mention dropping bytestring support in some places, they seem to have also dropped implicit conversion to str for whole host of things.
 2020-03-31 15:31:52 -04:00
Alex Dusenbery
c8d78eb3db Fix a flaky teams test - sort lists before comparison. 2020-03-19 17:49:12 -04:00
Jansen Kantor
21c6d6b08d EDUCATOR-4952: Allow Users to join one team per open teamset (#23423) 
*allow users to join one team per teamset
 2020-03-19 13:56:35 -04:00
Alex Dusenbery
2cdb244858 remove some potentially problematic tests 2020-03-18 13:26:48 -04:00
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