Commit Graph

198 Commits

Author SHA1 Message Date
John Eskew
b777530dac Add SharedModuleStoreTestCase.setUpClassAndTestData() context manager
for use when a test class has a setUpTestData() method which uses
variables set up in the setUpClass() method.
Change base teams API test class to use the context manager.
2016-02-29 18:02:57 -05:00
Qubad786
b669765cee TNL-4136 fix topic detail endpoint's url to support alphanumeric and period characters 2016-02-23 02:39:22 +05:00
Robert Raposa
f555ffd585 Refactor and improve js_utils helpers
- Rename escape_json_dumps to dump_js_escaped_json
- Rename escape_js_string to js_escaped_string
- Update js_escaped_string to output empty string for None
- Introduce dump_html_escaped_json
- Move dump_js_escaped_json after the pipe as new best practice
- Introduce additional uses of helpers
- Introduce new djangolib directory and move js_utils
2016-02-03 17:13:21 -05:00
Peter Fogg
75bef91e17 Fix query counts after Django 1.8 merge. 2016-02-03 13:58:23 -05:00
Nimisha Asthagiri
f3cb692472 Safe Session Cookies Middleware 2016-01-26 17:23:03 -05:00
Usman Khalid
8bdc097293 Fixes after rebase to Django 1.8 2015-12-17 22:10:21 +05:00
Mushtaq Ali
1d57ef220e Fix course specific user teams in teams dashboard page 2015-12-07 18:46:01 +05:00
Ned Batchelder
f5d0f3ff55 Remove useless pylint suppressions 2015-11-22 07:41:19 -05:00
muhammad-ammar
29acc3acfc resolve merge conflicts
test fixes
2015-11-18 19:13:54 +05:00
muhammad-ammar
8d5f153201 Merge remote-tracking branch 'origin/release' into dj18-release-merge
Conflicts:
	common/djangoapps/util/testing.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/teams/tests/test_views.py
	openedx/core/djangoapps/programs/models.py
	openedx/core/djangoapps/user_api/accounts/tests/test_views.py
	requirements/edx/github.txt
2015-11-18 17:53:44 +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
J. Cliff Dyer
00b3051b73 Make sure proper logic is used for getting account privacy. 2015-11-06 15:53:08 +00:00
Robert Raposa
3682fac832 Add json escaping to Studio
Make escaping for json simpler and more consistent in Mako templates
- add escape_json_dumps to escape and json.dumps
- add escape_js_str to escape javascript string
- refactor Studio to use escape_json_dumps in Mako templates

TNL-2646: Escape json.dumps
2015-11-04 13:34:42 -05:00
Peter Fogg
759a3c4f1f Fix withData and withConfiguration helpers.
Both of them dynamically generate specs which close over the iteration
variable of a for loop. Closures capture *references*, not values, and
so when the variable is mutated on loop iteration its new value is
used when the spec is called. This means that instead of running a
spec with n different values, we run the spec n times with the same
value. This is bad.
2015-11-02 16:34:06 -05:00
Ned Batchelder
a0c25f88c3 Merge pull request #10279 from edx/ned/cleaner-django-meta
No need for docstrings on "class Meta"
2015-10-21 09:35:40 -04:00
Ned Batchelder
322ca34b20 Remove pylint pragmas from "class Meta"
Also remove useless docstrings where they were added to keep pylint
quiet.
2015-10-21 07:37:00 -04:00
wajeeha-khalid
017477a8d7 MA-1281 User Account: added account_privacy field in GET and PATCH 2015-10-21 11:33:38 +05:00
Andy Armstrong
8914aaf8d4 Refactor discussions code to address flaky test
TNL-3247

Removed remaining synchronous AJAX calls from discussions
Updated the profile view tests to use an attached view for testing
Removed one-time JQuery intiialization that could fail and break multiple tests
2015-10-07 11:22:48 -04:00
Ned Batchelder
84a94c2358 Include a message in the teams.ImmutableMembershipFieldException
Also add a __repr__ to CourseTeam so that it could be useful too.
2015-10-02 15:00:01 -04:00
Diana Huang
7bfb1127f5 Merge pull request #9771 from edx/diana/add-team-to-reports
Add team column to grade reports.
2015-10-02 09:35:25 -04: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
Brian Beggs
d9de52751d Merge remote-tracking branch 'origin/release' into bbeggs/2015-09-22-release-to-master 2015-09-28 20:58:34 -04:00
Ben Patterson
2fd6add524 Revert "Merge DRF 3.1 in to master" 2015-09-28 17:12:43 -04:00
Brian Beggs
53524efbd8 Fixes for rebasing of the release on 2015-09-23 2015-09-28 11:52:33 -04:00
Will Daly
d11ccad0fc 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-28 11:52:30 -04:00
Brian Beggs
144c347387 Fixes for rebasing of the release on 2015-09-23 2015-09-25 12:40:58 -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
Christine Lytwynec
80dafc2133 Merge pull request #9506 from edx/clytwynec/AC-157
Manage focus on delete component modal
2015-09-25 08:58:26 -04:00
Andy Armstrong
5316cbee02 Merge pull request #8809 from edx/zoldak/update-sinon
Update Sinon library
2015-09-24 13:17:03 -04:00
Jesse Zoldak
1aa181c90a Update sinon to version 1.17.0 2015-09-24 10:55:48 -04:00
Eric Fischer
02b72abccb Disable button while running
Now using withDisabledElement to prevent multiple event handling. I've
attempted to write this as a common function in view_utils, so that this
approach can be used more generally, wherever needed. Includes a unit test.

Thanks to Christina and Andy for all their help on this one.
2015-09-24 10:13:30 -04:00
Andy Armstrong
b2a0b2f728 Improve response handling in AjaxHelpers
I've changed the logic so that AjaxHelpers keeps
track of which requests have not yet had mock
responses sent. This ensures that every response
is handled before moving on to the next one,
rather than always handling the last request.
My intention is that this won't allow bugs to creep
in where a request isn't fired and instead the test
responds to an old request. It also should ensure
that extra events aren't accidentally fired.
2015-09-23 20:23:09 -04:00
Andy Armstrong
d09034e065 Improve team testing of routers 2015-09-23 13:10:46 -04:00
Diana Huang
a53903c46a Add team column to grade reports. 2015-09-23 12:21:13 -04:00
Christine Lytwynec
f96d4b7142 Manage focus on modal confirmation prompt 2015-09-21 13:36:02 -04:00
Muhammad Ammar
edf88962b5 Merge pull request #9534 from edx/ammar/update-factory-boy
Update factory_boy
2015-09-18 19:04:48 +05:00
Christina Roberts
56fd445f5c Merge pull request #9798 from edx/christina/teams-dashboard
Emit event when last_activity_at is updated.
2015-09-18 09:54:36 -04:00
muhammad-ammar
6a5ce5d544 Upgrade factory_boy
TNL-3179
2015-09-18 18:02:38 +05:00
Kevin Falcone
81abdbe81b Merge pull request #9819 from edx/release
Release
2015-09-17 21:30:48 -04:00
cahrens
0d99449899 Emit event when last_activity_at is updated.
TNL-3303
2015-09-17 17:19:17 -04:00
Peter Fogg
0f78989220 Escape team name in screenreader text. 2015-09-17 16:15:50 -04:00
John Eskew
7c0663f25e Merge remote-tracking branch 'origin/release' into jeskew/resolve_issues_with_release 2015-09-16 15:58:08 -04:00
Peter Fogg
33f559b04a Remove membership field from teams when serializing memberships.
TNL-3281
2015-09-15 13:05:10 -04:00
Peter Fogg
e38fc82650 Merge pull request #9752 from edx/peter-fogg/handle-elasticsearch-errors
Add error handling for elastic search.
2015-09-14 17:01:10 -04:00
Peter Fogg
ca124354ba Add error handling for elastic search. 2015-09-14 16:15:17 -04:00
Andy Armstrong
f80b6221d9 Fix duplicate calls to search API
TNL-3198

Also fixed a regression with the search breadcrumbs
where it wasn't possible to navigate back to the
full list.
2015-09-14 13:32:45 -04:00
Peter Fogg
0612e914dc Various accessibility fixes for Teams.
Update teams breadcrumb aria-label, make team membership display as a
<ul>, fix contrast issues, and remove an extraneous angle bracket.
2015-09-11 15:25:30 -04:00
Bill DeRusha
4234ff5959 Merge pull request #9707 from edx/bderusha/edx-search-config
Add edx-search configuration to lms
2015-09-11 14:45:23 -04:00