Merge pull request #1244 from MITx/bug/dhm/jan13

Bug 107: create update not working

cms/djangoapps/contentstore/tests/test_course_updates.py

@@ -1,8 +1,6 @@
 from cms.djangoapps.contentstore.tests.test_course_settings import CourseTestCase
 from django.core.urlresolvers import reverse
 import json
-from cms.djangoapps.contentstore.course_info_model import update_course_updates
-
 
 class CourseUpdateTest(CourseTestCase):
     def test_course_update(self):
@@ -14,14 +12,17 @@ class CourseUpdateTest(CourseTestCase):
         content = '<iframe width="560" height="315" src="http://www.youtube.com/embed/RocY-Jd93XU" frameborder="0"></iframe>'
         payload = { 'content' : content,
                    'date' : 'January 8, 2013'}
-        # No means to post w/ provided_id missing. django doesn't handle. So, go direct for the create
-        payload = update_course_updates(['i4x', self.course_location.org, self.course_location.course, 'course_info', "updates"] , payload)
+        url = reverse('course_info', kwargs={'org' : self.course_location.org, 'course' : self.course_location.course,
+                                             'provided_id' : ''})
+        
+        resp = self.client.post(url, json.dumps(payload), "application/json")
+        
+        payload= json.loads(resp.content)
+        
+        self.assertHTMLEqual(content, payload['content'], "single iframe")
         
         url = reverse('course_info', kwargs={'org' : self.course_location.org, 'course' : self.course_location.course,
                                              'provided_id' : payload['id']})
-         
-        self.assertHTMLEqual(content, payload['content'], "single iframe")
-        
         content += '<div>div <p>p</p></div>'
         payload['content'] = content
         resp = self.client.post(url, json.dumps(payload), "application/json")

cms/djangoapps/contentstore/views.py

@@ -973,6 +973,11 @@ def course_info_updates(request, org, course, provided_id=None):
     # ??? No way to check for access permission afaik
     # get current updates
     location = ['i4x', org, course, 'course_info', "updates"]
+    
+    # Hmmm, provided_id is coming as empty string on create whereas I believe it used to be None :-(
+    # Possibly due to my removing the seemingly redundant pattern in urls.py
+    if provided_id == '':
+        provided_id = None
 
     # check that logged in user has permissions to this item
     if not has_access(request.user, location):