Commit Graph

418 Commits

Author SHA1 Message Date
Eric Fischer
1b66abc50a Merge pull request #9323 from edx/efischer/expand_instructor_definition
Expand instructor definition
2015-08-18 10:09:32 -04:00
Eric Fischer
350d15876a Expand instructor definition
Per discussions, for the purposes of the teams API, an 'instructor'
is any of:
	-course staff
	-global staff
	-discussion privileged users
This change will include the last case, which previously did not have
instructor access. Changes will be documented on the teams API wiki:
https://openedx.atlassian.net/wiki/display/TNL/Team+API

Tests have also been added to confirm this functionality.

TNL-2984
2015-08-17 17:59:43 -04:00
cahrens
41f207dec3 The stale flag needs to take into account its previous state.
Otherwise it can change from false to true without re-rendering. TNL-3072
2015-08-17 17:05:27 -04:00
muzaffaryousaf
9e7d278dd0 Revert "Accessibility fixings."
This reverts commit 789732a7c8.
2015-08-17 16:52:01 +05:00
muzaffaryousaf
e73a855659 Revert "Accessibility fixings for new post button on teams."
This reverts commit e133a63a5b.
2015-08-17 16:51:52 +05:00
muzaffaryousaf
e133a63a5b Accessibility fixings for new post button on teams.
TNL-1930
2015-08-17 16:27:45 +05:00
muzaffaryousaf
789732a7c8 Accessibility fixings.
TNL-1930
2015-08-17 15:56:58 +05:00
cahrens
c929cdb54d Add an additional test case related to re-fetching data. 2015-08-14 14:48:09 -04:00
Andy Armstrong
fb6ec9560f Fix broken test due to two PRs merging 2015-08-14 12:24:46 -04:00
Andy Armstrong
1265d540ad Merge pull request #9302 from edx/andya/team-refresh-handling
Implement model refreshing for Teams tab
2015-08-14 11:50:54 -04:00
Andy Armstrong
a24e3cb0fc Implement model refreshing for Teams tab
TNL-2976
2015-08-14 11:12:11 -04:00
Diana Huang
d244368dbf Show correct error when creating a team.
TNL-3063
2015-08-14 10:20:02 -04:00
Daniel Friedman
04d3cb982d Merge pull request #9303 from edx/usman/tnl3053-fetch-memberships
Also pass course_id when fetching memberships for user in team profile view.
2015-08-13 22:32:59 -04:00
Christina Roberts
4fc2ae7ca8 Merge pull request #9312 from edx/diana/remove-invite-link
Remove invite link functionality from teams.
2015-08-13 20:02:53 -04:00
Diana Huang
afa587cc38 Remove invite link functionality from teams.
TNL-3062
2015-08-13 17:53:26 -04:00
Eric Fischer
57d49b0adb Support filtering team membership
Adds tests and functionality to support filtering the results returned
from team_membership endpoint with optional course_id parameter. Will
return 400 Bad Request in the event that the given course_id does not
match up with the provided team_id (team.course_id does not match), or
if the user is not enrolled in the course given.

Documentation has been added to the relevant API page on the wiki:
https://openedx.atlassian.net/wiki/display/TNL/Team+API
2015-08-13 16:52:31 -04:00
Usman Khalid
08498bc283 Also pass course_id when fetching memberships for user in team profile view.
TNL-3053
2015-08-13 23:15:25 +05:00
muhammad-ammar
5fc612079b Support leaving a team
TNL-1910
2015-08-13 20:27:38 +05:00
muhammad-ammar
853f97afbc support joining a team
TNL-1909
2015-08-13 14:41:21 +05:00
muzaffaryousaf
a56e6bf743 Team details page.
TNL-1906
2015-08-13 14:20:07 +05:00
Peter Fogg
26bbbb967e Fix various team accessibility issues.
Authors:
  - Peter Fogg
  - Daniel Friedman

TNL-1953
2015-08-13 00:34:54 -04:00
Andy Armstrong
8bbf7c57ac Improve Teams tab navigation 2015-08-12 19:20:48 -04:00
Andy Armstrong
8bd1f69821 Govern team creation for non-privileged users
TNL-2960

Non-privileged users can only be in one team, so don't
allow them to create new teams if they are already
members of another.
2015-08-12 19:16:02 -04:00
Bill DeRusha
09acca2de8 Team API include correct info when expanding users TNL-2975
Create read-only serializer to handle User/UserProfile data
together.

Refactor GET accounts to use the new read-only joint serializer

Fix tests to check for new expanded user info

Update tests in teams/tests/test_views.py to test for both
public and private profiles on expands user

Update serializer to utilize the request object for creating absolute uris
2015-08-12 14:33:07 -04:00
Sarina Canelake
71d5180ba1 Add more context to translation strings 2015-08-11 13:11:32 -04:00
Usman Khalid
b4ed9a28b0 My Teams tab.
TNL-1911
2015-08-11 17:27:53 +05:00
Christina Roberts
dbe74ea340 Merge pull request #9221 from edx/christina/less-assets
Christina/less assets
2015-08-07 10:34:20 -04:00
Bill DeRusha
69a460fdca Merge pull request #9206 from edx/bderusha/teams-full-country-language-names
Add Full Country & Language Names to Teams
2015-08-07 09:49:48 -04:00
cahrens
68645db38b Reduce dependency on courseware_js.
TNL-2945
2015-08-07 09:14:06 -04:00
Peter Fogg
e0e895a531 Add Bok Choy tests for teams page URL routing. 2015-08-06 13:32:48 -04:00
Bill DeRusha
2398824bba Add Full Country & Language Names to Teams [TNL-2891] 2015-08-06 13:17:01 -04:00
Peter Fogg
2f7fa6fd8b Enforce discussions permissions in teams UI.
Adds a read-only mode to the discussion module which disables any
controls for updating the discussion (votes, follows, replies,
etc). This mode is enabled for users who are not a member of the team,
and are also not moderators, admins, or community TAs.
2015-08-06 11:15:56 -04:00
Andy Armstrong
63da1907eb Show inline discussion component on Team view
TNL-2515
2015-08-06 11:15:55 -04:00
muhammad-ammar
69450fce47 create a new team
TNL-1899
2015-08-05 17:55:26 +05:00
Diana Huang
39cccac7e5 Merge pull request #9176 from edx/diana/add-team-creator-automatically
Add the creator of a team to that team.
2015-08-04 17:06:54 -04:00
Diana Huang
1c6c1654be Add the creator of a team to that team.
TNL-1908
2015-08-04 16:08:40 -04:00
Ned Batchelder
f54fe787c6 Remove needless 'disable=no-member' pragmas 2015-08-03 17:47:44 -04:00
Peter Fogg
b47922cea0 Make team chat icon appear. 2015-08-03 10:09:40 -04:00
Peter Fogg
95b8d72347 Revert "Remove unnecessary DB call in team pagination."
This reverts commit 948f652cf0.
2015-07-30 10:52:13 -04:00
Peter Fogg
dfafb03ebc Add New Relic tracing to TeamsListView.get. 2015-07-29 17:38:41 -04:00
Peter Fogg
6473cd9bd8 Add index on CourseTeam name. 2015-07-29 17:38:41 -04:00
Ben McMorran
44d4e28053 Add discussion_topic_id to Team API docstrings 2015-07-29 14:52:58 +00:00
Ben McMorran
2bad5946e7 Merge pull request #8982 from edx/benmcmorran/team-discussion-context
TNL-1943 Support thread context for team discussions
2015-07-28 14:23:11 -04:00
Daniel Friedman
c8e4f2ca7d Merge pull request #9103 from edx/dan-f/fix-team-count
Fix team count in topic serializers
2015-07-28 14:10:01 -04:00
Ben McMorran
6b08bb20f8 TNL-1943 Support thread context for team discussions 2015-07-28 17:18:45 +00:00
Daniel Friedman
db6add1c59 Fix team count in topic serializers
TNL-2892
2015-07-28 13:14:18 -04:00
Peter Fogg
505b64730a Merge pull request #9082 from edx/peter-fogg/team-list-accessibility
Give teams view error messages focus.
2015-07-28 09:03:40 -04:00
Peter Fogg
becf15e50a Give teams view error messages focus. 2015-07-27 16:22:34 -04:00
David Ormsbee
58f36d3e93 Enable faster ModuleStore tests with SharedModuleStoreTestCase.
This is a new TestCase base class, intended for situations where
you only want to initialize course content in the setUpClass(),
as opposed to setUp(). This is done for performance reasons, since
many test cases only use courses in a read-only fashion,
particularly in LMS tests.

This commit also converts the following modules to use this new
base class:

  lms/djangoapps/ccx/tests/test_ccx_modulestore.py (38s -> 4s)
  lms/djangoapps/discussion_api/tests/test_api.py (2m45s -> 51s)
  lms/djangoapps/teams/tests/test_views.py (1m17s -> 33s)
2015-07-27 13:02:16 -04:00
Peter Fogg
4b0c3be75c Convert to named arguments for localized strings. 2015-07-24 14:51:17 -04:00