Commit Graph

83 Commits

Author SHA1 Message Date
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
Alex Wang
77eb01ff42 resolve pylint violations in lms/djangoapps/teams (#22063)
MST-6
2019-10-18 10:20:55 -04:00
Ned Batchelder
efba6e45e8 Finally import courseware properly everywhere to get rid of a warning 2019-09-26 09:40:15 -04:00
Amit
df949d6de1 INCR-480: Make compatible with Python 3.x and fixed line over length limit (#20833) 2019-06-20 16:20:49 -04:00
Nimisha Asthagiri
e160b23903 Move django_comment_client to discussion/ 2019-05-03 12:09:46 -04:00
Nimisha Asthagiri
ef0e06cc0a Revert "Discussions consolidation" 2019-05-02 14:59:56 -04:00
Nimisha Asthagiri
db89a64d06 Move django_comment_client to discussion/ 2019-05-01 19:13:10 -04:00
Matthew Piatetsky
764319d3e0 fix unicode strings in lms/ part 2 2019-02-13 10:35:56 -05:00
Jeremy Bowman
68902a2f3f TE-2689 Remove useless pylint suppressions part 3 2018-08-16 09:57:01 -04:00
George Babey
26bac9f611 Moved paginators to edx_rest_framework_extensions package
Pagination should be standard and easy to adopt so moved the paginators
into the edx_rest_framework_extensions package so they can be easily
installed into other app/projects
2018-02-16 09:46:01 -05:00
Brian Beggs
ca92ffe21d Remove SubfieldBase metaclass 2017-10-26 16:59:51 -04:00
John Eskew
2cd62c7bfb Upgrade django-rest-framework version to edX fork, which is DRF v3.6.3
with a custom patch needed by edx-platform.
Upgrade django-filter as well to v1.0.4
Import DjangoFilterBackend from the correct module - django_filter.
Add django-filter to INSTALLED_APPS.
2017-07-14 16:05:13 -04:00
Andy Armstrong
79acb5c5be Reorder LMS imports using isort 2017-06-11 21:48:06 -04:00
Jonathan Piacenti
a04a635efc Add accomplishments to user profile 2016-04-01 10:13:08 -05:00
Mushtaq Ali
1d57ef220e Fix course specific user teams in teams dashboard page 2015-12-07 18:46:01 +05:00
Usman Khalid
6cb62f2697 Rebase upgrade Django to v1.8.5
Please note that this is a squshed commit and the work of:
Symbolist, macdiesel, nedbat, doctoryes, muzaffaryousaf and muhammad-ammar
2015-11-10 15:00:19 -05:00
Peter Fogg
ffe2aef41e Fix displaying wrong membership on "My Team" view.
The heart of this fix is to change the "My Team" view to use a
collection of teams instead of memberships. The team card is
refactored to only take a team, rather than attempt to be polymorphic
over teams and team memberships. This change enabled removing a good
amount of old code. This also requires adding a `username` parameter
to the teams list endpoint which allows getting a list of all teams
for a single user, in order to allow refreshing the "My Teams" view
correctly. Currently this list is of length at most one.

TNL-3410
2015-10-01 11:56:15 -04:00
muzaffaryousaf
b2ebb680de DRF uses query_params instead of QUERY_PARAMS.
TNL-3442
2015-09-30 20:45:40 +05:00
Ned Batchelder
8ec2de9359 DRF 3.1 now uses request.data instead of request.DATA 2015-09-29 15:25:55 -04:00
Will Daly
8555630df7 Upgrade djangorestframework to v3.1
* Upgrade edx-submissions
* Upgrade edx-ora2
* Upgrade edx-val
* Upgrade edx-proctoring
* Update all edx-platform code that depends on DRF, including:
  - auth_exchange
  - cors_csrf
  - embargo
  - enrollment
  - util
  - commerce
  - course_structure
  - discussion_api
  - mobile_api
  - notifier_api
  - teams
  - credit
  - profile_images
  - user_api
  - lib/api (OAuth2 and pagination)
2015-09-25 12:40:57 -04:00
cahrens
0d99449899 Emit event when last_activity_at is updated.
TNL-3303
2015-09-17 17:19:17 -04:00
Peter Fogg
ca124354ba Add error handling for elastic search. 2015-09-14 16:15:17 -04:00
Bill DeRusha
eec2bed0c7 Add edx-search configuration to lms
remove "defensive code" until we can figure out how to actually
catch the errors,
2015-09-11 13:55:39 -04:00
Diana Huang
f37ffc2f03 Add the course as part of the context for teams events.
TNL-3248
2015-09-10 17:24:54 -04:00
Eric Fischer
65cbab739a Team deleted and learner removed events
Now emitting `edx.team.deleted` event where relevant. Includes tests.
Also includes tests to cover learner_removed events that are fired
as part of the deletion process, as well as learner_removed events
fired from the edit membership view.

Adding these deleted events has brought about a change in the teams
API - the DELETE membership endpoint now takes an optional `admin`
query parameter to differentiate between admin removal and self
removal for analytics purposes.

Also includes some changes needed to get page viewed events working
with admin tools changes made in this PR.
2015-09-10 16:37:04 -04:00
Peter Fogg
0c3be8e121 Delete Team functionality and tests
TNL-3164 TNL-3163
2015-09-10 12:42:33 -04:00
Andy Armstrong
439ddfa97e Merge pull request #9668 from edx/andya/team-search-i18n-bug
Improve support for Chinese characters in team search
2015-09-10 11:09:17 -04:00
Andy Armstrong
321a0ea6a0 Fix searching with Chinese characters
TNL-3228
2015-09-09 14:16:05 -04:00
Clinton Blackburn
b5d6b210fd Merge pull request #9681 from edx/release
Release 2015-09-09
2015-09-09 12:38:15 -04:00
Diana Huang
0b78ffdf83 Merge pull request #9632 from edx/diana/teams-changed-event
Add events for tracking when teams are edited.
2015-09-08 15:21:49 -04:00
Bill DeRusha
62ef4b5b8f Add more defensive code around elasticsearch connection 2015-09-08 12:12:05 -04:00
Diana Huang
8c1bf2cd3a Add events for tracking when teams are edited.
TNL-3190
2015-09-04 15:27:40 -04:00
Peter Fogg
86cce5f0ef Add teams eventing for search.
TNL-3187
2015-09-04 12:40:37 -04:00
Diana Huang
a743f4a642 Add teams eventing and tests. 2015-09-04 10:45:01 -04:00
Daniel Friedman
0e180bd2c2 Add membership thumbnails to team cards.
TNL-3172
2015-09-03 10:58:58 -04:00
Andy Armstrong
4be74937df Add searching to the teams view
TNL-1935
2015-09-02 12:26:07 -04:00
Christina Roberts
9f86f18841 Merge pull request #9503 from edx/christina/composite-index
Team API Performance Improvements
2015-09-01 10:30:47 -04:00
muhammad-ammar
4840b46716 i18n and rtl fixes
TNL-3125
2015-09-01 12:16:41 +05:00
Peter Fogg
17253ead24 Cache team_size on CourseTeam model and remove is_active field.
TNL-3112 TNL-3154
2015-08-28 12:29:42 -04:00
cahrens
cd4916b68a MySQL order_by is case insensitive.
Tests run with SQLlite though, which is case sensitive.
2015-08-28 12:16:38 -04:00
muzaffaryousaf
f788caa6cc Edit team page for Instructor only.
TNL-1914
2015-08-28 12:47:15 +05:00
Bill DeRusha
973314de7b Add basic elasticsearch search for teams
TNL-3014

Add tests for search

Add text_search to TeamsListView

Add reindex command line tool for course teams

Add Search Pagination and update comments

Move paginate_search_results to common library
2015-08-24 09:22:06 -04:00
Peter Fogg
839fb70869 Remove unnecessary New Relic trace. 2015-08-21 15:07:46 -04:00
Christina Roberts
2f5193cf18 Merge pull request #9383 from edx/christina/search-sort
Add sorting by last_activity_at.
2015-08-19 16:48:10 -04:00
Eric Fischer
5ee49351f1 Merge pull request #9346 from edx/efischer/fix_docs_course_id_team_membership
Updating documentation for team_membership endpoint
2015-08-19 14:59:38 -04:00
cahrens
295108c9a4 Add sorting by last_activity_at.
TNL-3011
2015-08-19 14:23:38 -04:00
Christina Roberts
276cba90c6 Merge pull request #9262 from edx/christina/search-sort
Add sorting by team_count, as well as secondary sort (by name).
2015-08-19 12:25:07 -04:00
Eric Fischer
86f4806e84 Updating documentation for team_membership endpoint
Recent changes to the team_membership API endpoint added the
course_id optional parameter, but the in-code documentation
was never updated to reflect this. The wiki documentation at
https://openedx.atlassian.net/wiki/display/TNL/Team+API is OK.

Related: https://github.com/edx/edx-platform/pull/9289
2015-08-19 12:21:45 -04:00