Calen Pennington
03a05fd9d4
Always call super(..).setUp() from setUp
2015-02-04 09:09:14 -05:00
Sarina Canelake
20e2ee9a57
s/pylint: disable=E0611/pylint: disable=no-name-in-module/
2014-12-01 11:22:09 -05:00
Sarina Canelake
e0f1d3f3f3
s/pylint: disable=C0111/pylint: disable=missing-docstring/
2014-12-01 11:22:09 -05:00
Sarina Canelake
725e4908e3
Remove more pep8 violations
2014-11-04 07:37:41 -05:00
cahrens
66173ab9e6
Add "visible_to_staff_only" field to support staff locking in Studio.
...
STUD-1875
2014-07-14 14:46:40 -04:00
cahrens
a4b172d9d8
Display names, help text, and "deprecated" for Advanced Settings.
...
STUD-302, STUD-303
2014-06-26 16:54:22 -04:00
Adam Palay
e5fa0c5dd9
add max-attempts to inheritance.py (LMS-2130)
2014-05-12 15:55:15 -04:00
Jay Zoldak
c5a7911b87
Fix pylint disable pragmas that were pep8 violations
2014-03-20 10:18:40 -04: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
566bb16220
Implement InheritanceFieldData
2014-01-14 13:09:36 -05:00
Ned Batchelder
1932c126b8
Rename DbModel to KvsFieldData.
2014-01-14 13:09:36 -05:00
Alexander Kryklia
14dc814e2a
Fix typo
2013-10-23 13:06:12 +03:00
Alexander Kryklia
2c90fd18f4
Rename IsoTime to RelativeTime.
2013-10-23 13:06:12 +03:00
Alexander Kryklia
ece4cb6645
Add test for IsoTime
2013-10-23 13:04:31 +03:00
Ned Batchelder
d7e441088b
Adjust parameters to construct_xblock_from_class to match XBlock repo.
2013-09-30 21:09:43 -04:00
Calen Pennington
d77491e46a
Pull XModule attributes out into a mixin that can be applied to xblocks
2013-09-27 13:11:05 -04:00
Calen Pennington
f500b72290
Make sure that we have the right set of fields available during xml parsing
...
We had a bug where mixins weren't being applied before `load_from_xml`
was called. This meant that not all of the fields were being loaded
correctly. To fix it, we used the mixoligist from the runtime to apply
the mixins earlier in the process. However, that caused the mixins to be
applied twice.
The included fixes to xblock resolved the multiply-applied mixins, and
the fixes to the parsing code make it simpler to understand, and add
some unit tests of the parsing to boot.
2013-09-27 10:57:39 -04:00
Don Mitchell
fc131fa841
Add InheritanceKVS and standardize inherited attr patterns
2013-09-06 12:19:50 -04:00
Calen Pennington
8201b1412e
Use XBlock 0.3
2013-09-06 09:45:59 -04:00
Jay Zoldak
c8949b99d1
Disable pylint violation E0611 when importing assert_* methods from nose.tools
...
Cleaned up files with muliline imports
Cleaned up files that do not use these imports
Misread comment
2013-08-27 16:21:33 -04:00
Peter Fogg
9c84440501
PR comment cleanup.
2013-08-06 13:23:33 -04:00
Don Mitchell
3722685e1a
No longer persist XModule templates
...
Instead, we use XModule field default values when creating an empty
XModule. Driven by this use case, we also allow for XModules to be
created in memory without being persisted to the database at all. This
necessitates a change to the Modulestore api, replacing clone_item with
create_draft and save_xmodule.
2013-07-16 14:33:58 -04:00
Chris Dodge
ac4e20b4f3
change serialize_field to check for type. If value is a string, simply return that, otherwise do a json.dumps
2013-07-12 15:27:36 -04:00
Chris Dodge
547f4633d5
use better syntax for asserting that exception is thrown
2013-07-12 12:47:23 -04:00
Chris Dodge
5aae3c6971
add new tests for the string literal serialization
2013-07-12 11:14:35 -04:00
Don Mitchell
8b23eeca7e
Minor pylint/whitespace changes
2013-06-25 22:34:29 -04:00
lapentab
b9ca9a84d7
Merge branch 'master' into blapenta/fix-test-coverage
...
Conflicts:
AUTHORS
common/lib/xmodule/xmodule/tests/test_annotatable_module.py
common/lib/xmodule/xmodule/tests/test_capa_module.py
common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
common/lib/xmodule/xmodule/tests/test_conditional.py
common/lib/xmodule/xmodule/tests/test_html_module.py
common/lib/xmodule/xmodule/tests/test_progress.py
common/lib/xmodule/xmodule/tests/test_xml_module.py
lms/djangoapps/courseware/tests/__init__.py
2013-06-18 13:41:53 -04:00
lapentab
b93f00e02f
Rename system_test to get_test_system
2013-06-18 11:37:24 -04:00
Calen Pennington
82606a062c
Make XModuleDescriptor use __init__ from XBlock
...
Fixes JIRA LMS-203
2013-06-17 13:38:57 -04:00
Bethany LaPenta
85f1386918
Fixed test_system looking like a test to nosetests, also fixed a class in test_error_module.py that had one class inheriting from another
2013-06-13 14:30:07 -04:00
cahrens
c7e37887b3
Merge updates.
2013-06-13 11:22:34 -04:00
cahrens
0f8d7c744c
Test cleanup.
2013-06-13 10:42:23 -04:00
cahrens
6e92ddf3dd
Cannot set String field to a dict anymore!
2013-06-12 17:07:41 -04:00
cahrens
89d0003603
Be strict about ModelType expected types, rename Object as Dict.
2013-06-12 14:59:17 -04:00
cahrens
86d952bf91
Change to putting serialize/de-serialize directly in xml_module.
2013-06-12 13:34:38 -04:00
cahrens
0baec0a164
Move string fields, get rid of hard-coded list of booleans.
2013-06-07 15:45:34 -04:00
cahrens
8fd15ce45d
Review feedback.
2013-05-30 14:13:10 -04:00
cahrens
551a1c1516
pep8 and documentation cleanup.
2013-05-29 15:47:46 -04:00
cahrens
3dc9791382
Update xblock, start Selenium.
2013-05-21 09:38:56 -04:00
cahrens
fa1dfd716a
Update unit test for editable_metadata_fields.
2013-05-15 15:25:36 -04:00
cahrens
594d28a653
Pass default value through.
2013-05-06 16:03:41 -04:00
cahrens
37d594ce37
Get rid of non-editable scope.
2013-05-03 14:58:33 -04:00
