Commit Graph

418 Commits

Author SHA1 Message Date
Ben Warzeski
64e8332d38 Topic teams actions (#24336)
* modern eslint allowances

* update topic teams to request team membership per local teamset

* update tests for topic_teams change

* cleanup

Co-authored-by: Ben Warzeski <benwarzeski@edX-C02CD0HCLVDM.cable.rcn.com>
2020-06-26 14:46:51 -04:00
Nathan Sprenkle
835ccafa5d Fix team size validation issue (#24290)
* Edit team manage to check sizes at end of import

* Fix size validation to take new teams into account

* Remove redundant max size check

* Consolidate team membership counters

* Remove unused user_ids_by_teamset_id set

* Fix team removal to only occur after validation

* Update team full error message

* Prefetch users when looking up team counts
2020-06-26 11:55:36 -04:00
Ali Akbar
e4bf35e556 Merge pull request #24313 from edx/aakbar/PROD-1688
allow moderators to post in forum
2020-06-26 17:00:47 +05:00
Ali-D-Akbar
e319e84969 allow moderators to post in forum 2020-06-26 16:29:54 +05:00
Jansen Kantor
79a76887b2 rebind events on re-render (#24288) 2020-06-23 13:56:12 -04:00
Aarif
27480cdd2f Removed deprecated future imports 2020-06-23 18:51:43 +05:00
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
David Ormsbee
0b4cf7e06c Merge pull request #23039 from open-craft/samuel/fix-unescaped-selector
SE-2176 Fix elem not selected if id contains special chars
2020-06-19 12:13:20 -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
Samuel Walladge
43f0cd72af Merge remote-tracking branch 'origin/master' into samuel/fix-unescaped-selector 2020-06-16 09:52:38 +09:30
Nathan Sprenkle
44b0d832a0 Scope team search to course when removing from team (#24174) 2020-06-10 10:03:27 -04:00
Ben Warzeski
7c9f901096 Update 'create team?' prompt check in topic teams to look in teamset (#24088)
* Update check for showing the 'create team?' prompt in topic teams to look in teamset

* fix tests and correct which collection we are checking

* eslint fixes

Co-authored-by: Ben Warzeski <benwarzeski@edX-C02CD0HCLVDM.cable.rcn.com>
2020-06-03 11:37:43 -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
Samuel Walladge
71fcf6e725 Fix issues with xss linters
Improve accuracy of javascript-escape linter: Previously this would
match on FOOescape() and FOO.escape calls, but neither are the global
escape function we are worried about.

The regex probably isn't 100% accurate; there may be still false
positives (javascript allows a large range of characters in identifiers,
some of which may not be covered by [\w.$]). The main thing is to avoid
false negatives here though - this will definitely catch any use of
`escape()` or `window.escape()`.

Also remove javascript-interpolate lint - this was deemed unecessary.
StringUtils.interpolate is not in fact safe (it does no html escaping),
so the results of this lint are misleading.
2020-05-04 09:27:18 +09:30
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
Nathan Sprenkle
02392879b7 Team Management Upload A11y Improvements (#23502)
* Expose team management file input for better a11y
* Disable upload button when file not selected
2020-03-30 17:03:15 -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
Alex Dusenbery
f2efb28833 Generate migrations for changes to default values of fields in the CourseTeam model. 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
Nathan Sprenkle
9535c37c79 Fix UX issues on Team Management tab (#23417)
* Don't disable download button after click

* Allow reuploading for team membership CSV
2020-03-17 12:03:53 -04:00
Nathan Sprenkle
8219ddc40a Fix A11y issues on Team Management tab (#23403)
* Change upload div to a button for focus styling

* Fix team membership button resize on focus

* Remove box shadow from focus styling
2020-03-17 11:16:24 -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
Nathan Sprenkle
5578cca1cc Show multiple team memberships in My Team tab (#23324)
* Enable pagiation to show all a learner's teams on the "My Teams" tab
* Selectively hide/show pagination on the "My Teams" tab
* Increase "My Teams" page size to 5
2020-03-11 15:05:15 -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
Jansen Kantor
dd5bc541ce add simple queryset (#23252) 2020-03-03 16:43:26 -05:00