Commit Graph

6908 Commits

Author SHA1 Message Date
Don Mitchell
3ab17d7523 Allow colons in Locator fields. 2013-11-21 10:41:49 -05:00
Calen Pennington
b4a1840344 Move xmodule_runtime.xmodule_instance registration earlier
This allows XModules (specifically CombinedOpenEnded) to use ajax_url
during their init functions (which would, before, have thrown an
exception).

[LMS-1493]
2013-11-20 10:15:09 -05:00
Calen Pennington
6c9ad30ee1 Update open-ended tests to load the module between 'requests'
Under normal operation, XModules are reloaded on each request from a
student. CombinedOpenEnded modules have code that runs at initialization
that validates the students state. These changes makes that code run
during several long-form unit tests (testing CombinedOpenEnded across
multiple 'requests').

These tests are marked as expectedFailure because they now exhibit the
same failures as observed in [LMS-1493] (namely, the students state gets
reset, because CombinedOpenEnded interprets system.ajax_url raising an
error as meaning that the problem definition and the student answers are
in conflict)
2013-11-20 10:15:09 -05:00
Giulio Gratta
745f45090f Merge pull request #1702 from edx/giulio/anon-user-id-yml
Adding a YAML file to demonstrate how to include anonymized user IDs in Studio elements.
2013-11-19 11:29:26 -08:00
Christina Roberts
d4082859f8 Merge pull request #1714 from edx/christina/fix-children
The forcing of IDs to non-draft must happen in base.py instead of draft....
2013-11-19 11:18:54 -08:00
cahrens
ed9a61e2d9 The forcing of IDs to non-draft must happen in base.py instead of draft.py.
The draft.py solution only worked when the parent was also in the draft store.
2013-11-19 12:08:29 -05:00
Sarina Canelake
69ef753195 Merge pull request #1641 from manuel-freire/master
298.15 K is 25 C, not 0 (0 is defined to be at 273.15)

#os
2013-11-19 08:25:49 -08:00
Jim Abramson
57cb983308 Merge pull request #1704 from edx/release-hotfix-2013-11-15
merge 2013-11-15 hotfix branch to master
2013-11-19 07:56:12 -08:00
Greg Price
89924c5e61 Alert users when forum AJAX requests fail
AJAX requests on forums pages occasionally fail (usually when a request
to the comments service times out), but the user is not made aware of
the failure. This manifests as either the system not appearing to store
state (e.g. if an attempt to flag a post fails) or something taking
forever to load. Now, a modal will pop up to alert the user that a
request has failed and instruct them to reload the page.

In the longer term, we should fix each user gesture that results in an
AJAX call to gracefully handle a failure by resetting the state of the
world appropriately and aleritng the user.

JIRA: FOR-37
2013-11-19 09:55:49 -05:00
Greg Price
0c28858c64 Remove unused forum CoffeeScript code 2013-11-19 09:52:21 -05:00
Julia Hansbrough
dac5d2ac0e Merge pull request #1634 from edx/flowerhack/feature/refactor-to-track-enrollment
Flowerhack/feature/refactor to track enrollment
2013-11-19 06:27:22 -08:00
polesye
38163cf942 BLD-410: Add tests. 2013-11-19 14:37:14 +02:00
Manuel Freire
cdc3ad1cc4 298.15 K is 25 C, not 0 (0 is defined to be at 273.15)
Signed-off-by:  <manuel.freire@fdi.ucm.es>
2013-11-19 12:52:13 +01:00
Giulio Gratta
f125a604a4 Adding a YAML file to demonstrate how to include anonymized user IDs in Studio elements. 2013-11-18 14:44:46 -08:00
polesye
e9b1d2102d Merge pull request #1688 from edx/anton/add-template-checkboxes
Add template for checkboxes to studio.
2013-11-18 11:24:25 -08:00
Gabe Mulley
4b1974cdbc fix spammy log messages from course_id tracking in CMS 2013-11-18 08:47:54 -05:00
polesye
4b87237825 BLD-193: Add template for checkboxes to studio. 2013-11-18 09:50:53 +02:00
Calen Pennington
43c0210889 Use correct set of OpenEndedChild states 2013-11-16 11:04:00 -05:00
Calen Pennington
e47e60f68b Assign a score of 0 to tasks with no attempts 2013-11-16 10:30:05 -05:00
Calen Pennington
347f0c7508 Centralize to a single GradingServiceError, so that it's caught when expected 2013-11-15 15:42:22 -05:00
Calen Pennington
4c21cb200f Teach OEE to consider old task_states when trying to recover from an xml mismatch 2013-11-15 14:13:19 -05:00
polesye
153bc25d8c BLD-502: Add improvements to Video player. 2013-11-15 18:12:51 +02:00
Julia Hansbrough
f950ea106d response to CR 2013-11-15 15:38:21 +00:00
polesye
50250d82d0 Merge pull request #1653 from edx/anton/video-add-test
Video: tests to check speed change
2013-11-15 07:12:49 -08:00
Christina Roberts
e2926a94e0 Merge pull request #1621 from edx/christina/item-create
Change save_item and create_item to be RESTful.
2013-11-15 06:16:54 -08:00
polesye
526f791800 BLD-424: Add test to check speed change. 2013-11-15 13:39:49 +02:00
Julia Hansbrough
e73489ec31 Response to CR 2013-11-14 22:34:18 +00:00
cahrens
569c86de74 Code review feedback. 2013-11-14 17:09:24 -05:00
David Baumgold
81e1d18de3 Merge pull request #1670 from antoviaque/hidden-module-unicode
hidden-module-unicode: Return unicode string to pass assertion
2013-11-14 14:02:07 -08:00
cahrens
53a4016619 Utility method for converting string to bool. 2013-11-14 13:47:46 -05:00
Sarina Canelake
b1d91fad49 Merge pull request #1663 from edx/sarina/persist-student-answers-on-error
Sarina/persist student answers on error
2013-11-14 08:15:08 -08:00
cahrens
a170c6f4e7 Change save_item and create_item to RESTful URL.
Part of STUD-847.
2013-11-14 11:03:31 -05:00
Xavier Antoviaque
0293727220 hidden-module-unicode: Return unicode string to pass assertion
XBlock Fragments expect unicode strings, and fail on an assertion when
it isn't:

```
2013-11-14 07:55:50,774 ERROR 3788 [django.request] base.py:215 - Internal Server Error: /courses/TestU/TST101/now/courseware/41d55c576a574fde99319420228f7f88/5fef5794e34842f4a2d45ebcdeaa9a3a/
Traceback (most recent call last):
  File "/edx/app/edxapp/venvs/edxapp/local/lib/python2.7/site-packages/django/core/handlers/base.py", line 111, in get_response
    response = callback(request, *callback_args, **callback_kwargs)
  File "/edx/app/edxapp/venvs/edxapp/local/lib/python2.7/site-packages/django/contrib/auth/decorators.py", line 20, in _wrapped_view
    return view_func(request, *args, **kwargs)
  File "/edx/app/edxapp/venvs/edxapp/local/lib/python2.7/site-packages/django/utils/decorators.py", line 91, in _wrapped_view
    response = view_func(request, *args, **kwargs)
  File "/edx/app/edxapp/venvs/edxapp/local/lib/python2.7/site-packages/django/views/decorators/cache.py", line 75, in _cache_controlled
    response = viewfunc(request, *args, **kw)
  File "/edx/app/edxapp/edx-platform/lms/djangoapps/courseware/views.py", line 407, in index
    context['fragment'] = section_module.render('student_view')
  File "/edx/app/edxapp/venvs/edxapp/src/xblock/xblock/core.py", line 156, in render
    return self.runtime.render(self, view, context)
  File "/edx/app/edxapp/edx-platform/common/lib/xmodule/xmodule/x_module.py", line 903, in render
    return block.xmodule_runtime.render(to_render, view_name, context)
  File "/edx/app/edxapp/venvs/edxapp/src/xblock/xblock/runtime.py", line 356, in render
    frag = view_fn(context)
  File "/edx/app/edxapp/edx-platform/common/lib/xmodule/xmodule/seq_module.py", line 77, in student_view
    rendered_child = child.render('student_view', context)
  File "/edx/app/edxapp/venvs/edxapp/src/xblock/xblock/core.py", line 156, in render
    return self.runtime.render(self, view, context)
  File "/edx/app/edxapp/edx-platform/common/lib/xmodule/xmodule/x_module.py", line 903, in render
    return block.xmodule_runtime.render(to_render, view_name, context)
  File "/edx/app/edxapp/venvs/edxapp/src/xblock/xblock/runtime.py", line 356, in render
    frag = view_fn(context)
  File "/edx/app/edxapp/edx-platform/common/lib/xmodule/xmodule/vertical_module.py", line 27, in student_view
    rendered_child = child.render('student_view', context)
  File "/edx/app/edxapp/venvs/edxapp/src/xblock/xblock/core.py", line 156, in render
    return self.runtime.render(self, view, context)
  File "/edx/app/edxapp/edx-platform/common/lib/xmodule/xmodule/x_module.py", line 903, in render
    return block.xmodule_runtime.render(to_render, view_name, context)
  File "/edx/app/edxapp/venvs/edxapp/src/xblock/xblock/runtime.py", line 356, in render
    frag = view_fn(context)
  File "/edx/app/edxapp/edx-platform/common/lib/xmodule/xmodule/x_module.py", line 464, in student_view
    return Fragment(self.get_html())
  File "/edx/app/edxapp/venvs/edxapp/src/xblock/xblock/fragment.py", line 34, in __init__
    self.add_content(content)
  File "/edx/app/edxapp/venvs/edxapp/src/xblock/xblock/fragment.py", line 71, in add_content
    assert isinstance(content, unicode)
AssertionError
```
2013-11-14 13:57:08 +01:00
Oleg Marshev
128846f67d BLD-449: Fix rearrange bug in problems. 2013-11-14 13:44:58 +02:00
Sarina Canelake
9508b3f9b4 pep8/pylint fixes for capa 2013-11-13 16:12:25 -05:00
Calen Pennington
3d5aa2b5bc Merge pull request #1575 from cpennington/hotfix-memory-leaks
Improve memory profile during course grading runs
2013-11-13 12:07:36 -08:00
Sarina Canelake
862beafdd1 Persist student answers on input error
LMS-469
2013-11-13 14:15:52 -05:00
Calen Pennington
061a46beef Formalize various access roles as objects
This centralizes the logic for group membership, and means that we
don't need to make queries to find out whether the legacy groups names exist.
2013-11-13 13:42:37 -05:00
Will Daly
01b07abdfc Merge pull request #1650 from edx/will/wait-for-settings-menu
Added wait for JS before clicking nav menus
2013-11-13 07:06:23 -08:00
polesye
f9782ff370 Merge pull request #1617 from edx/anton/fix-speed-menu
Video: Fix speed menu when YouTube is unavailable.
2013-11-12 23:20:49 -08:00
Will Daly
35ec9d3105 Added wait for JS before clicking nav menus 2013-11-12 17:33:56 -05:00
Jason Bau
59225b973d Merge pull request #1640 from edx/jbau/fix/remove-revision-from-middleware
Jbau/fix/remove revision from middleware
2013-11-12 13:16:51 -08:00
polesye
50674a966b BLD-457: Fix speed menu when YouTube is unavailable. 2013-11-12 21:44:06 +02:00
Ned Batchelder
c8e0fb2508 Mock servers shouldn't pollute test output.
BY writing to stderr, BaseHTTPRequestHandler writes log messages to the
console during testing.  This makes the output harder to interpret.
Write the log messages to stdout instead, so that test runners will
suppress them during passing tests, and show them during failing tests.

It would be nice to have a place to write this method just once for the
Youtube and LTI mock servers, but we don't seem to have a place for code
as common as that.
2013-11-12 10:19:19 -05:00
Jason Bau
bc32899c1b actually, just remove the revision 2013-11-08 15:16:26 -08:00
Jason Bau
2627db13a0 make edxapp work when not run from a git repo 2013-11-08 12:49:52 -08:00
Julia Hansbrough
8042332cda purchased_callback now uses the change_mode method 2013-11-08 20:33:52 +00:00
Julia Hansbrough
94b8b0acc9 all CourseEnrollment modifications route through create_or_update 2013-11-08 20:18:28 +00:00
Julia Hansbrough
73af5d017e Changed create_enrollment to create_or_update_enrollment 2013-11-08 19:01:51 +00:00
Carlos Andrés Rocha
b72604d2bf Merge pull request #1615 from rocha/fix-external_auth-djangostore
Fix error on external_auth djangostore
2013-11-08 10:26:51 -08:00