Commit Graph

59 Commits

Author SHA1 Message Date
Qubad786
c7364a06a4 handle if required module(s) for conditional module are staff only 2016-11-09 20:11:33 +05:00
cahrens
b8ddf709dc Convert javascript_loader to JS.
Also reformat to 4 spaces per indent.
2016-10-13 13:59:00 -04:00
Oksana Slusarenro
cda7f1dc6c Changed the Help and Field Label text. 2016-09-15 10:24:54 +03:00
Oksana Slusarenro
6d56701326 Add ui in studio for conditional_module. 2016-09-07 11:34:23 +03:00
Christina Roberts
2497f0a0eb WIP: xblock pipeline work (#10176)
[PERF-303] Integer XBlocks/XModules into the static asset pipeline.

This PR, based on hackathon work from Christina/Andy, implements a way to discover all installed XBlocks and XModules and to enumerate their public assets, then pulling them in during the collectstatic phase and hashing them.  In turn, the methods for generating URLs to resources will then returned the hashed name for assets, allowing them to be served from nginx/CDNs, and cached heavily.
2016-04-29 10:52:42 -04:00
Sven Marnach
3d7246ecc8 Allow masquerading as a specific user different from the logged in user. 2015-07-13 18:55:45 -07:00
cahrens
73e7ced6f9 Introduce constants for studio_view, student_view, and author_view. 2014-06-20 11:41:23 -04:00
Julia Hansbrough
6e702c3131 Fix conditional module rendering 2014-06-10 15:32:32 +00:00
Calen Pennington
d654798856 Make course ids and usage ids opaque to LMS and Studio [partial commit]
This commit updates common/lib/xmodule.

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-08 20:28:53 -04:00
Valera Rozuvan
1136336fc4 Converting collapsible module to JavaScript. 2014-03-11 11:28:46 +00:00
cahrens
276c6e918e Store locations in ReferenceLists so they can be converted to locators.
STUD-1027
2014-02-12 14:08:24 -05:00
Calen Pennington
b0bed170de Enable (and test) xml export of pure XBlocks
[LMS-179]
[LMS-209]
[LMS-1345]
2014-02-05 13:02:40 -05:00
Calen Pennington
79e1dae0e7 Fix pylint violations from #2129 2014-01-15 11:05:56 -05:00
Calen Pennington
46109bb3e8 Use XBlock xml serialization and deserialization
XModules continue to use their own interface for xml, but provide an
adaptor that makes the the XBlock interface available.

[LMS-179]
2014-01-14 13:28:47 -05:00
Ned Batchelder
b6bd293266 Clean up some pre-existing formatting. 2014-01-14 13:09:35 -05:00
cahrens
367ea683bd Support non-ascii chars as arguments to format.
We've had errors in export related to non-ascii chars being passed to format. Proactively making these usages of format robut to non-ascii chars.

Part of STUD-868
2013-12-20 14:55:07 -05:00
Calen Pennington
06fadcdc0c Make conditional module and poll modules a little easier to understand 2013-12-20 12:32:15 -05:00
David Baumgold
e26fc08d2b Update logging.getLogger() calls to use edx instead of mitx 2013-12-04 15:18:15 -05:00
Calen Pennington
32af903f85 Provide access to the course_id directly on XModules/Descriptors
Fixes [BLD-456] and [LMS-1392], but making sure that we're always asking
XModules about their course_id (since the ModuleSystem has access to
that data).
2013-10-30 11:23:11 -04:00
Calen Pennington
658810a94f Use xblock render shortcuts 2013-10-08 15:58:23 -04:00
Calen Pennington
6b474724ac Make XModuleDescriptor and XModule act as a single class
By transparently proxying between the XModuleDescriptor and the XModule,
and between their runtimes, we can make them act as a single class, so
that we can swap in an actual XBlock instead.
2013-10-08 15:29:17 -04:00
Calen Pennington
230bf0c643 Switch get_html replacement out for using wrap_child 2013-10-03 14:28:19 -04:00
Calen Pennington
8201b1412e Use XBlock 0.3 2013-09-06 09:45:59 -04:00
Carlos Andrés Rocha
e4ee1c6c9b Rename arguments of modx_dispatch and handle_ajax related functions
Refactor a bit modx_dispatch
2013-06-25 13:38:57 -04:00
Alexander Kryklia
23d4a2b3db renames is_completed to is_submitted, fixes docstrings and rst docs 2013-06-20 15:09:05 +03:00
Alexander Kryklia
a7cf9d186d adds doc about correct 2013-06-20 14:56:32 +03:00
Alexander Kryklia
6f964acec5 added docs and added is_correct to conditional 2013-06-20 14:56:32 +03:00
Calen Pennington
e791e84ea7 Remove the stores_state field from XModule
stores_state is now only used in a single test, in conjunction with
has_score. In practice, it's never the case that stores_state is false
when has_score is true, so we can delete stores_state entirely, and just
use has_score for the grading test.
2013-06-13 14:38:59 -04:00
Brian Wilson
7486e0f637 cope with ErrorModule as source (or required) module, and add tests. 2013-04-16 01:00:46 -04:00
Chris Dodge
8ece663284 more drive by violation fixes 2013-04-12 15:45:27 -04:00
ichuang
b3f00a6725 add default message to conditional 2013-03-31 12:31:05 +00:00
Vasyl Nakvasiuk
3c645de43f extend xmodule.ConditionalModule docstrings 2013-03-19 17:29:28 +02:00
Vasyl Nakvasiuk
f172405c9a remove xml documentation from docs/source/ 2013-03-18 15:37:29 +02:00
Calen Pennington
92e99d7a8b Move field definitions for XModules into mixin classes, so that descriptors and modules always have the same set of fields 2013-03-13 11:35:50 -04:00
Vasyl Nakvasiuk
e9dacfae09 remove self.contents from ConditionalModule 2013-02-28 20:07:59 +02:00
Vasyl Nakvasiuk
9186e61702 use shortcut get_display_items 2013-02-27 18:52:17 +02:00
Vasyl Nakvasiuk
81bfa46f2e fix caching problem in conditional_module 2013-02-27 18:34:09 +02:00
Vasyl Nakvasiuk
076926c43a call system.error_tracker together with logging 2013-02-26 10:51:19 +02:00
Vasyl Nakvasiuk
aa34c9d335 remove 'passed' feature 2013-02-25 16:56:34 +02:00
Vasyl Nakvasiuk
0448ef5e03 add docstring 2013-02-25 16:15:33 +02:00
Alexander Kryklia
4600155f97 add icon class support 2013-02-25 13:13:00 +02:00
Alexander Kryklia
9cdd271ee4 added icon class 2013-02-25 12:04:18 +02:00
Alexander Kryklia
6940cb334a small refactor 2013-02-19 13:33:55 +02:00
Alexander Kryklia
e2470842f7 get_module get descr insted of loc 2013-02-19 13:31:28 +02:00
Alexander Kryklia
72f6578395 fix typo 2013-02-18 11:46:07 +02:00
Alexander Kryklia
0a80f835c0 Revert "fix typo"
This reverts commit 24d2c11c3e.
2013-02-18 11:45:21 +02:00
Alexander Kryklia
24d2c11c3e fix typo 2013-02-18 11:45:03 +02:00
Alexander Kryklia
059b9f66e3 poll and conditional finished 2013-02-15 18:48:39 +02:00
Calen Pennington
bd822b9d2f Fix tests post-merge 2013-02-13 14:13:22 -05:00
ichuang
b5ba88f0af Merge branch 'master' of github.com:MITx/mitx into feature/ichuang/conditional-xmodule-icon-and-errortracker
Conflicts:
	common/lib/xmodule/xmodule/conditional_module.py
2013-02-06 18:15:36 -05:00