studio - resolving local merge due to editor alias

cms/djangoapps/contentstore/tests/test_contentstore.py

@@ -367,7 +367,7 @@ class ContentStoreTest(ModuleStoreTestCase):
 
         resp = self.client.get(reverse('course_index', kwargs=data))
         self.assertContains(resp,
-            '<a href="/MITx/999/course/Robot_Super_Course" class="class-name">Robot Super Course</a>',
+            '<article class="courseware-overview" data-course-id="i4x://MITx/999/course/Robot_Super_Course">',
             status_code=200,
             html=True)
 

cms/djangoapps/contentstore/tests/test_course_settings.py

@@ -143,10 +143,6 @@ class CourseDetailsViewTest(CourseTestCase):
     def test_update_and_fetch(self):
         details = CourseDetails.fetch(self.course_location)
 
-        resp = self.client.get(reverse('course_settings', kwargs={'org': self.course_location.org, 'course': self.course_location.course,
-                                                                  'name': self.course_location.name}))
-        self.assertContains(resp, '<li><a href="#" class="is-shown" data-section="details">Course Details</a></li>', status_code=200, html=True)
-
         # resp s/b json from here on
         url = reverse('course_settings', kwargs={'org': self.course_location.org, 'course': self.course_location.course,
                                                  'name': self.course_location.name, 'section': 'details'})

cms/templates/login.html

@@ -77,7 +77,11 @@
       submit_data,
       function(json) {
         if(json.success) {
-          location.href = "${reverse('homepage')}";
+          var next = /next=([^&]*)/g.exec(decodeURIComponent(window.location.search));
+          if (next && next.length > 1) {
+            location.href = next[1];
+          }
+          else location.href = "${reverse('homepage')}";
         } else if($('#login_error').length == 0) {
           $('#login_form').prepend('<div id="login_error" class="message message-status error">' + json.value + '</span></div>');
           $('#login_error').addClass('is-shown');