Commit Graph

2417 Commits

Author SHA1 Message Date
zubair-arbi
fc7d491cdc show upload progress on import course view + display last import status on import page load
STUD-2017
2014-09-08 17:51:51 +05:00
Adam Palay
cfeb76e67f Merge remote-tracking branch 'origin/release' into adam/resolve-merge-conflicts
Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
2014-09-05 13:20:15 -04:00
Don Mitchell
b28af4fdaa Temporarily disable bulk operations b/c old mongo
does too much work on exit and doesn't handle nesting
2014-09-04 17:28:17 -04:00
Nimisha Asthagiri
08a0c6392e Merge pull request #5070 from edx/reruns/error-handling
Course Rerun: include stack trace in errors and Log errors.
2014-09-04 16:25:43 -04:00
Nimisha Asthagiri
bdd91daeb6 Include stack trace in Course Rerun errors; Log errors. 2014-09-04 14:31:07 -04:00
Nimisha Asthagiri
b6590228a3 LMS-11342 Fix Split reimport issue. 2014-09-03 23:03:00 -04:00
Calen Pennington
48bdeeeae8 Merge pull request #5052 from edx/split/bulk-rerun-LMS-11332
Enable bulk operations on split
2014-09-03 11:18:23 -04:00
Nimisha Asthagiri
bd54cd8c57 LMS-11332 Unit test 2014-09-03 09:15:01 -04:00
Don Mitchell
96bc5cc83a Merge pull request #5001 from edx/split/edit_info
Split/edit info
2014-09-03 08:28:31 -04:00
Don Mitchell
85fa712fdf Change published_date to published_on
to make consistent with other edit info timestamps
LMS-11184
2014-09-02 13:20:23 -04:00
Andy Armstrong
7b26e85478 Merge branch 'release' into andya/merge-hotfix-2014-08-29
Conflicts:
	cms/djangoapps/contentstore/tests/test_import.py
	common/lib/xmodule/xmodule/modulestore/__init__.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
	lms/djangoapps/courseware/tests/test_module_render.py
2014-08-29 16:50:10 -04:00
Andy Armstrong
c14891e920 Pre-cache has_changes when computing ancestors 2014-08-29 14:09:42 -04:00
Don Mitchell
1db107c2ce Add memoization for has_changes 2014-08-29 14:09:41 -04:00
Calen Pennington
3afc125ecb Add test to verify bad query behavior of xblock_handler 2014-08-29 14:09:41 -04:00
Calen Pennington
8dc7f34295 Improve debuggability when call-count numbers don't match up 2014-08-29 14:09:35 -04:00
muhammad-ammar
2efee4eb88 Merge pull request #4939 from edx/ammar/bok-choy-transcript-tests-batch3
Bok-Choy Video Transcript Tests Batch3
2014-08-28 19:44:24 +05:00
Muhammad Ammar
6b2874de2b Bok-Choy Video Transcript tests Batch3 2014-08-28 09:10:13 +00:00
Calen Pennington
0e7e266a5b Push bulk_write_operations up into ModuleStoreRead, and rename to remove reference to writes 2014-08-27 16:29:48 -04:00
Calen Pennington
a205788c4d Work around for split not having a coherent way to work with/track updated versions of structures 2014-08-27 16:29:48 -04:00
Calen Pennington
3672c9a292 Make find_matching_* work during split bulk operations 2014-08-27 16:29:47 -04:00
Calen Pennington
e7ce41061e Improve debuggability when call-count numbers don't match up 2014-08-27 16:29:47 -04:00
Calen Pennington
337b0b48aa Improve check_number_of_calls family of methods 2014-08-27 16:29:47 -04:00
Don Mitchell
ee8fc41b62 compute_publish_state -> has_published_version
LMS-11213
2014-08-27 11:48:10 -04:00
Andy Armstrong
890e25f416 Merge pull request #4454 from Stanford-Online/sjang92/advanced_settings_feedback
Sjang92/advanced settings feedback
2014-08-26 19:08:39 -04:00
Se Won Jang
11d260910f Implemented Validation for Course Advanced Setting
This commit adds validation for course advanced settings. Currently when course
administrators make invalid changes in the Settings/Advanced Settings tab,
they're not notified through a new modal window of the list of invalid settings
changes.

* Extending CourseMetadata
    - Previously, we only had update_from_json method in CourseMetadata.py,
      and it was only validating one field every POST request.
    - Now we have validate_and_update_from_json method that encapsulates the
      functionality of update_from_json into a validation call
    - To avoid discrepancy of validation standards between modules, validation
      uses the from_json method implemented to each field in xblock.

* Different Response in advanced settings ajax requests
    - After receiving a POST ajax request, course.py calls
      validate_and_update_from_json, and sends a json object of either:
        1) valid course metadata model
        2) error objects

* Error Messages shown in validation-error-modal
    - error objects passed through ajax are shown in a separate modal.
2014-08-26 11:24:38 -07:00
Nimisha Asthagiri
e42a3f15db Update opaque-keys library to use block_id for html_id for new keys.
Catch more places where get_children was giving us version aware references.
LMS-11237
2014-08-25 17:41:57 -04:00
Alexander Kryklia
095b07275e Unflag Group Configurations, Render only existing children in staff view of split_test. 2014-08-22 16:43:54 -04:00
Ben McMorran
e8fd9c08c1 Merge pull request #4934 from edx/benmcmorran/course-settings-error
Fix error when changing course details on split
2014-08-22 14:47:15 -04:00
Ben McMorran
e933c9fe18 Fix error when changing course details on split 2014-08-22 10:22:57 -04:00
muhammad-ammar
4815adb641 Merge pull request #4869 from edx/ammar/bok-choy-video-transcript-tests-batch2
Bok-Choy Video Transcript Tests Batch 2
2014-08-22 15:39:27 +05:00
Oleg Marshev
7506a479c6 Allow one group in a group configuration. 2014-08-22 11:52:35 +03:00
Muhammad Ammar
75a0d52472 Bok-Choy Video Transcript Tests Batch 2 2014-08-22 07:28:48 +00:00
Waheed Ahmed
f686e7d0b9 Passed cls=EdxJSONEncoder on json.dumps to fix save, edit and import.
STUD-2096
2014-08-22 12:23:46 +05:00
Ben McMorran
62643a5941 Fix broken rerun test 2014-08-21 15:43:22 -04:00
Ben McMorran
ff525bea96 Fix field serialization 2014-08-21 12:11:30 -04:00
Ben McMorran
b6d9ef3ed7 More PEP8/pylint cleanup 2014-08-21 12:11:29 -04:00
Don Mitchell
3b6b4668dd On rerun, override the course start date
LMS-11011
2014-08-21 12:11:29 -04:00
Don Mitchell
85f5c49bb7 Unit tests for rerun
along w/ fixes to make them work
LMS-11011
2014-08-21 12:11:29 -04:00
Ben McMorran
de52f82352 PEP8/pylint cleanup 2014-08-21 12:11:28 -04:00
Ben McMorran
4e41a42c76 Rename unsucceeded to in_process 2014-08-21 12:11:28 -04:00
Don Mitchell
78879ebc18 Asset urls must start w/ slash
LMS-11233
2014-08-21 12:11:27 -04:00
Ben McMorran
2839ad8711 PR cleanup 2014-08-21 12:11:26 -04:00
Ben McMorran
46932ee0f9 Replace data-test-course and data-test-unsucceeded with data-course-key 2014-08-21 12:11:26 -04:00
Mat Peterson
6096bae755 Skipping rerun test on feature flag conditional 2014-08-21 12:09:13 -04:00
Mat Peterson
0088978281 Set GlobalStaff permissions on reruns 2014-08-21 12:09:13 -04:00
Mat Peterson
e8763ef715 Do TODOs in test_contentstore.py 2014-08-21 12:09:13 -04:00
Mat Peterson
18a6a0487b added JS to outline page after bulk publishing rewrite 2014-08-21 12:09:12 -04:00
Mathew Peterson
9f8f64cffe Course Reruns UI
Studio: adding course re-run-centric static template rendering

* initial HTML for dashboard states
* initial HTML for new course re-run view/form
* initial HTML placeholder for outline alert UI

Conflicts:
	cms/templates/index.html

Studio: adding styling for course re-run-centric views

* adding new view/page mast-wizard type
* refactoring create course/element form styling
* adding course re-run view specific styling
* adding courses processing styling (w/ alerts and status)

Course rerun server-side updates: support display_name and DuplicateCourseError.

Studio: further design revisions and tweaks from feedback

* removing new window attribute from re-run control
* removing links from processing courses
* revising look/feel of dismiss action on dashboard + alert
* correcting font-weight of dashboard processing title
* adding extra space to course rerun action on dashboard
* re-wording secondary cancel action on rerun view

Conflicts:
	cms/templates/index.html

Added interation on unsucceeded courses in dashboard

Studio: removing 'rel=external' property from course re-run actions

Studio: removing hover styles for processing courses

Fixed value bug in split and set course listing to display run

moved task.py for rerun
2014-08-21 12:09:12 -04:00
polesye
732bcbdeb6 STUD-1911, STUD-1932: Publish sections, subsections and units from course outline. 2014-08-21 17:34:06 +03:00
muhammad-ammar
06842be865 Merge pull request #4859 from edx/ammar/bok-choy-video-transcript-tests
Bok-Choy Video Transcript Tests Batch1
2014-08-21 12:01:04 +05:00