Commit Graph

637 Commits

Author SHA1 Message Date
Waheed Ahmed
aff849281d Revert "Test library failed to export after import"
This reverts commit 4c1c4619f0.
2015-08-12 02:06:09 +05:00
Peter Fogg
90d8774745 Test that discussion admins can delete team posts. 2015-08-07 09:46:12 -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
Daniel Friedman
f5840489a0 Allow editing of own post in team discussion 2015-08-06 11:15:55 -04:00
cahrens
41173fefee Only verify course access for threads with course context. 2015-08-06 11:15:55 -04:00
Andy Armstrong
63da1907eb Show inline discussion component on Team view
TNL-2515
2015-08-06 11:15:55 -04:00
Syed Hassan Raza
4c1c4619f0 Test library failed to export after import 2015-08-05 12:47:27 -07:00
Diana Huang
1c6c1654be Add the creator of a team to that team.
TNL-1908
2015-08-04 16:08:40 -04:00
Andy Armstrong
d98354d05d Merge pull request #9133 from edx/andya/remove-mustache-from-discussions
Remove Mustache usage from discussions
2015-08-01 20:48:50 -04:00
Andy Armstrong
540e8464d9 Remove Mustache usage from discussions 2015-08-01 17:13:14 -04:00
Ben McMorran
6d48e1360d Extend is_commentable_cohorted to support teams 2015-07-31 20:22:31 +00:00
Christina Roberts
b06e46c1db Merge pull request #9113 from edx/christina/team-discussion-permissions
Christina/team discussion permissions
2015-07-31 12:32:30 -04:00
Diana Huang
bc2892f2d3 Merge pull request #9142 from edx/diana/context-aware-comment-client
Make context for threads more implicit.
2015-07-31 10:29:29 -04:00
Diana Huang
c12c2933a7 Make context for threads more implicit. 2015-07-31 08:58:01 -04:00
cahrens
9d3e2c1a08 Ignore team membership for privileged users. 2015-07-30 17:06:40 -04:00
Ben McMorran
4a78271851 Move is_commentable_cohorted to django_comment_client 2015-07-30 20:59:34 +00:00
cahrens
01c22531d7 Add team permission check on commentable_id.
TNL-2864
2015-07-30 13:56:08 -04:00
Andy Armstrong
601f160271 Merge pull request #6503 from edx/pull-out-lms-underscore-templates
Pull discussion underscore templates out into individual files
2015-07-28 22:33:34 -04:00
Ben McMorran
6b08bb20f8 TNL-1943 Support thread context for team discussions 2015-07-28 17:18:45 +00:00
David Baumgold
c1a38a6dc7 Pull discussion underscore templates out into individual files
No need to go through Mako
2015-07-28 09:36:31 -04:00
tlindaliu
e0840d2d43 MA-849: Change has_access return type
New classes for the return type, and changes to the has_access function and tests to make them compatible.
2015-07-19 20:42:29 -04:00
Ben McMorran
2cf3390ba8 Merge pull request #8837 from edx/benmcmorran/discussion-caching-3
TNL-2389 Use discussion id map cache for thread creation and update
2015-07-17 11:33:02 -04:00
Ben McMorran
d36eb83a03 Add query count tests 2015-07-15 14:56:04 +00:00
Sarina Canelake
49f78b4742 Remove logging-not-lazy Pylint violations 2015-07-13 17:34:54 -04:00
Sarina Canelake
39d3537410 Pylint logging-format-interpolation: Convert logging calls to use %s formatting 2015-07-13 17:33:29 -04:00
Sarina Canelake
ba8fd1c21d Eliminate instances of unused-import Pylint violation 2015-07-13 17:33:25 -04:00
Ben McMorran
a119b723fd TNL-2389 Use discussion id map cache for thread creation and update 2015-07-13 20:56:50 +00:00
Ben McMorran
ccf20e52b1 TNL-2458 Cache discussion id mapping on course publish 2015-07-13 20:12:52 +00:00
Diana Huang
ecd237396e Merge pull request #8617 from edx/diana/course-tab-cleanup
Switch tabs to use ugettext_noop for titles.
2015-06-23 12:33:06 -04:00
Diana Huang
e6cbff47b7 Switch tabs to use ugettext_noop for titles. 2015-06-23 11:08:41 -04:00
Christopher Lee
44e13af6be Merge pull request #8576 from edx/gprice/discussion-api-max-depth
Enforce MAX_COMMENT_DEPTH in discussion_api
2015-06-22 13:30:37 -04:00
Diana Huang
d779466f09 Make course tab refreshing safer. 2015-06-19 14:53:49 -04:00
Greg Price
f47ab2bb18 Enforce MAX_COMMENT_DEPTH in discussion_api 2015-06-18 17:18:02 -04:00
David Ormsbee
b92ad0ad13 TNL-2291 Add caching to discussion forum permissions
Caches all permissions per user per course. Adds caching functionality to has_permission and replaces all instances of cached_has_permission with has_permission.
2015-06-17 21:08:28 +00:00
Sven Marnach
52f56ddd37 Add feature flag to allow hiding the discussion tab for individual courses. 2015-06-14 20:36:45 +02:00
cewing
6a0c9aee9d MIT CCX: Use CCX Keys
Implement the use of CCX opaque keys throughout the ccx code base

include the new custom ccx id package in the github checkouts list

update the coach dashboard wrapper to get CCX information from the incoming course_id, if possible

update function signatures for all view functions to expect CCX as passed by the dashboard wrapper (default to None), remove calls to get_ccx_for_coach as the ccx is passed in.

update reverse calls in python view code to use a CCXLocator for the URL instead of a CourseLocator

use CCXLocator where necessary

use course id to find ccx, instead of thread local

remove unused method and related tests

use course id for getting ccx

provide course id to the get_current_ccx method

ensure the course id passed in is a CourseKey instance of some type whether it starts out as a string or not

use the provided block to figure out what the course_id should be, then get the ccx for that

redirect to ccx dashboard using coach ccx if no ccx is passed in

update student dashboard listing for ccx to build an appropriate url from a CCXLocator, not from the course locator.

refactor building the ccx locator so we don't have to do it repeatedly

begin test refactoring after ccx_keys introduction

Ensure that when access checking happens, the course_locator form of a ccx locator is used.  This ensures that the access check happens against the course and it is not necesarry to duplicate the entire access control structure for the course.

pick up api change in ccx-keys

create and conditionally use a wrapper for the mixed modulestore returned by xmodule.modulestore.django.modulestore

the wrapper will strip and restore ccx values from CourseKey and UsageKey objects

fix return values on a few methods

remove unused symbol

pull updated ccx-keys package

set course_id on the caching descriptor system to avoid api incompatibilities in some subsystems

use ccx.course instead of self.course

fix get method to find course keys from blocks that are not themselves keys but have a location attribute (which will be a key)

if an item coming out of the db has children, restore the ccx to them as well

if the block passed in has a CCX key, unwrap that before we try to look up the override, otherwise it will never be found.

pick up a change in the ccx keys package that allows for stripping CCX identity from a usage key

begin writing tests to cover this modulestore wrapper

remove the switch_pocs view, the url pattern for it, and the tests that covered it

remove the ccx context and the middleware responsible for setting the current CCX.  These are no longer needed

all dashboard views should raise 404 if a ccx is not provided by the coach_dashboard decorator

code quality

prevent errors resulting from trying to `get` a ccx based on non-unique criteria.

remove obsolete usage of ACTIVE_CCX_KEY

fix setUp method for grading tests to properly create grades for the ccx rather than for the course.

clean up reverse calls

code quality

adding docstrings to clarify purpose of this patch

fix bug in getting ccx for coach

fix grading views to properly fetch a ccx-ified course so that grades for that version will be calculated

fix small errors in modulestore implementation

fix errant merge marker

update call to get_current_ccx after key refactoring merged with tab changes
2015-06-12 00:01:24 -07:00
Diana Huang
cddd387beb Merge pull request #8367 from edx/diana/merge-course-view-and-tab
Refactor and merge CourseViewType and CourseTab.
2015-06-08 16:08:27 -04:00
Diana Huang
7461a2fd37 Refactor and merge CourseViewType and CourseTab.
TNL-2321
2015-06-08 15:18:39 -04:00
Nimisha Asthagiri
d240785b17 MA-722 Render xBlock API Support 2015-06-05 11:18:48 -04:00
Diana Huang
dae137feaa Convert all tabs to the new plugin framework. 2015-06-02 15:05:16 -04:00
Greg Price
8fbfa2398e Add comment creation to discussion API 2015-05-29 11:05:02 -04:00
Greg Price
f891450f50 Add thread creation to discussion API
Also, fix the field-specific error format for all API endpoints.

This requires cs_comments_service commit fdf017c918.
2015-05-26 12:42:40 -04:00
Daniel Friedman
3acd7a008c Refactor and add tests for new grade report.
* Handle grading errors
2015-05-13 06:58:02 -04:00
Daniel Friedman
9269ec3b00 Add new instructor task for weighted problems 2015-05-12 16:32:00 -04:00
Christine Lytwynec
ddb1ae667e Split lms unittests into multiple shards 2015-05-07 09:17:26 -04:00
muzaffaryousaf
67848ff67b Link to learner profile page from username in discussions.
TNL-1503
2015-04-17 17:23:15 -04:00
Usman Khalid
c50f828187 Fixes after rebase. 2015-03-23 19:03:31 +05:00
muzaffaryousaf
e6c75529c0 Cohort discussion topics via UI in instructor dashboard.
TNL-1256
2015-03-23 14:28:22 +05:00
Usman Khalid
e07f45b5dd Removed cohort_config from advanced settings page.
TNL-1258
2015-03-23 09:58:25 +05:00
Usman Khalid
d382f569c8 Refactor django_comment_client.utils.prepare_content() to query
course cohort settings only once.

TNL-1258
2015-03-23 09:57:07 +05:00