Commit Graph

82 Commits

Author SHA1 Message Date
Martyn James
dcc8e95648 Implements SOL-20. Filtering for assets table by asset type 2015-01-16 12:53:24 -05:00
Calen Pennington
d919d2ae46 Teach LMS how to render XBlockAsides
[PLAT-217]
2014-12-13 08:26:28 -05:00
Christine Lytwynec
197f50b980 fix pep8 violation 2014-12-12 16:22:00 -05:00
Jim
fb9320afc1 Limit Upload File Sizes to GridFS.
This commit puts a limit on the size of files that
course staff can upload to MongoDB. The limit is
enforced on the frontend in javascript as well
as backend via the /upload endpoint.

The limit is hard-coded in cms/envs/common.py and
may be changed according to the user's custom
needs.

If the user tries to upload a file that's too
large, an error message will pop up, with a
customizable url that pointing the user to an
external page with an alternate upload procedure.
This url is specified im cms/envs/common.py.
If not set, this url will not be displayed.
2014-12-09 13:30:45 -08:00
Brandon DeRosier
046e295322 Change has_course_access definition and doc string
- has_course_access renamed to has_course_author_access for clarity
- Changed doc string to clearly state that it determines whether or not
  a user has write access to a course
2014-12-02 22:08:58 -05:00
Brandon DeRosier
bdc64a7c70 Moved has_course_access from CMS to student.auth (common) 2014-12-02 19:36:38 -05:00
stv
6763c5dd74 Fix PEP8: E126 continuation line over-indented
for hanging indent
2014-11-24 20:46:44 -05:00
Don Mitchell
78879ebc18 Asset urls must start w/ slash
LMS-11233
2014-08-21 12:11:27 -04:00
Nimisha Asthagiri
abbfa95e4c LMS-11168 Support for removing versions and branch in Split, Mixed, and SQL.
Make default_store thread-safe.
2014-08-07 18:07:41 -04:00
Nimisha Asthagiri
ec3011635d LMS-11179 Fix Assets with Split 2014-08-07 17:59:38 -04:00
Calen Pennington
1bc0b323b1 Explicitly create the AssetKey for all assets coming out of a ContentStore 2014-07-17 10:35:36 -04:00
Don Mitchell
cc6dfbbc75 Asset support in split
LMS-2876
2014-07-07 17:11:43 -04:00
Calen Pennington
cfcbdc0145 Move to OpaqueKey implementations from the external library
[LMS-2757]
2014-05-29 17:03:35 -04:00
Calen Pennington
0d88379eeb Make course ids and usage ids opaque to LMS and Studio [partial commit]
This commit adds all of cms.

These keys are now objects with a limited interface, and the particular
internal representation is managed by the data storage layer (the
modulestore).

For the LMS, there should be no outward-facing changes to the system.
The keys are, for now, a change to internal representation only. For
Studio, the new serialized form of the keys is used in urls, to allow
for further migration in the future.

Co-Author: Andy Armstrong <andya@edx.org>
Co-Author: Christina Roberts <christina@edx.org>
Co-Author: David Baumgold <db@edx.org>
Co-Author: Diana Huang <dkh@edx.org>
Co-Author: Don Mitchell <dmitchell@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Nimisha Asthagiri <nasthagiri@edx.org>
Co-Author: Sarina Canelake <sarina@edx.org>

[LMS-2370]
2014-05-07 12:56:43 -04:00
Giulio Gratta
3ffb6715e5 Internal/External Studio file URLs
- Changed link URL of file name to use public/LMS url
- Added toggle link to display all public URLs for instructor convenience
2014-02-24 11:54:09 -08:00
Ned Batchelder
229f3522fa Move date_utils to common/djangoapps/util 2014-02-18 17:35:56 -05:00
Don Mitchell
3ebac80778 Replace authz fns with roles.py ones
STUD-1006
2014-01-14 17:04:44 -05:00
Andy Armstrong
93675304da Add sorting to Studio's Files & Uploads page
Added sorting to the new pagination logic for STUD-995.
2014-01-08 10:35:40 -05:00
Andy Armstrong
089c2a0302 Fix STUD-1129: handle out-of-range page numbers 2014-01-06 18:00:32 -05:00
Andy Armstrong
f9c45586a4 Add pagination to Studio's Files and Uploads page
These changes implement STUD-813. The commit consists of the
following logical changes:
 - a REST API has been implemented for a course's assets
 - the page itself now fetches the assets client-side
 - the Backbone.Paginator library is used to support pagination
 - the AssetCollection has been refactored to extend
   Backbone.Paginator.requestPager so that it can be paged
 - an abstract PagingView class has been added to generalize
   the communication with a paging REST API
 - the AssetsView has been reimplemented to extend PagingView
 - two new child views have been added:
   - PagingHeader: the paging controls above the list of assets
   - PagingFooter: the paging controls below the assets
2014-01-05 23:35:12 -05:00
Don Mitchell
f5f24fcc12 Merge pull request #2022 from edx/dhm/locator_course_id
Change course_id to package_id
2013-12-23 11:15:48 -08:00
Don Mitchell
b7368ef69a Change course_id to package_id
on new Locators to make it clear that they have a different syntax
than Location.course_id altho they represent the same info.
2013-12-20 16:16:50 -05:00
Christina Roberts
3c0df16b0c Merge pull request #2004 from edx/christina/fix-thumbnail-warning
Properly format errors/warnings.
2013-12-20 10:11:12 -08:00
cahrens
65756bbf94 Properly format errors/warnings.
STUD-1063
2013-12-19 16:52:20 -05:00
Don Mitchell
b776590226 Rename BlockUsageLocator's block_id field from usage_id
usage_id implies self-sufficiency. The block_id is relative to its structure.
2013-12-17 12:15:32 -05:00
David Baumgold
8eff442752 mitxmako => edxmako 2013-12-03 14:15:09 -05:00
cahrens
39a8d07e47 Update URLs for assets. 2013-10-24 16:00:56 -04:00
Don Mitchell
70f77ce4bf Add pagination to asset retrieval
and push sorting down to the query
2013-10-10 17:26:23 -04:00
cahrens
1d7f891145 Delete asset from cache. 2013-09-25 17:29:47 -04:00
cahrens
c64e04d8c2 Add the ability to lock assets. 2013-09-25 17:29:27 -04:00
Don Mitchell
e69955b437 Pylint/pep8 fixes 2013-09-20 11:28:00 -04:00
cahrens
948615d66f Log warning if thumbnail cannot be deleted. 2013-09-20 10:44:55 -04:00
cahrens
fe6ed08518 Code review feedback. 2013-09-20 10:44:55 -04:00
cahrens
01d7d48f8f Create backbone models/views for assets.
cleanup

Updates.

Testing changes.

Testing changes.

asset-index progress state cleanjup.

cleanup
2013-09-20 10:44:54 -04:00
Julian Arni
0acaaa8859 Fix element name conflict 2013-09-09 18:32:01 -04:00
Julian Arni
e0ab75fb84 Add support for multiple file uploads 2013-08-29 09:55:40 -04:00
Julian Arni
cee44501f5 Merge remote-tracking branch 'origin/release'
Contains hotfix/2013-18-21
2013-08-27 11:05:13 -04:00
Julian Arni
03b140d538 Review fixes 2013-08-25 22:40:11 -04:00
Julian Arni
eaa4b3ef99 Pep8 and pylint fixes 2013-08-25 22:40:10 -04:00
Julian Arni
d991595ecb Split import-export into new file 2013-08-25 22:40:10 -04:00
Julian Arni
7666aad042 Check download integrity 2013-08-25 22:40:10 -04:00
Julian Arni
513b6cab3e Small review fixes.
Comments, httpresponse -> jsonresponse; make sure errors get relayed.
2013-08-25 22:40:09 -04:00
Julian Arni
3aaa2868c0 Process uploaded chunks.
Also adds lockfile for asynchronous status updates.
2013-08-25 22:40:09 -04:00
Julian Arni
7bf734221c Fix var name issue 2013-08-21 10:49:48 -04:00
Jay Zoldak
e91205aff3 Merge branch 'release'
Conflicts:
	common/lib/xmodule/xmodule/video_module.py
2013-08-16 14:25:03 -04:00
Chris Dodge
958597ac71 was getting unicode errors when exporting CB22x 2013-08-15 16:10:02 -04:00
Julian Arni
3ed4198204 Contentstore views pylint fixes 2013-08-14 19:10:00 -04:00
Chris Dodge
c6f277427c add a few debug messages to get localhost debug information. Also partition out the MongoDjangoToolbar configuration into a separate env config. This is because doing imports on large courses grinds localdev to a halt due to all the stack trace generation. 2013-08-09 20:46:14 -04:00
Chris Dodge
32d92d97e6 get_item -> get_instance 2013-08-08 21:01:38 -04:00
Chris Dodge
4054544126 handle exceptions inside the outer exception handling 2013-08-08 21:01:38 -04:00