Fix merge conflicts

cms/djangoapps/contentstore/tests/utils.py

@@ -13,10 +13,7 @@ from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
 from contentstore.tests.modulestore_config import TEST_MODULESTORE
 from contentstore.utils import get_modulestore
-<<<<<<< HEAD
-=======
 from student.models import Registration
->>>>>>> edx/master
 
 
 def parse_json(response):

cms/djangoapps/contentstore/views/import_export.py

@@ -22,20 +22,13 @@ from django.views.decorators.http import require_http_methods, require_GET
 from django_future.csrf import ensure_csrf_cookie
 from edxmako.shortcuts import render_to_response
 from xmodule.contentstore.django import contentstore
-<<<<<<< HEAD
-from xmodule.modulestore.xml_exporter import export_to_xml
+from xmodule.exceptions import SerializationError
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.keys import CourseKey
-from xmodule.exceptions import SerializationError
-
-from .access import has_course_access
-=======
-from xmodule.exceptions import SerializationError
-from xmodule.modulestore.django import modulestore, loc_mapper
-from xmodule.modulestore.locator import BlockUsageLocator
 from xmodule.modulestore.xml_importer import import_from_xml
 from xmodule.modulestore.xml_exporter import export_to_xml
->>>>>>> edx/master
+
+from .access import has_course_access
 
 from .access import has_course_access
 from extract_tar import safetar_extractall
@@ -240,13 +233,6 @@ def import_handler(request, course_key_string):
                     session_status[key] = 3
                     request.session.modified = True
 
-<<<<<<< HEAD
-                    auth.add_users(request.user, CourseInstructorRole(new_location.course_key), request.user)
-                    auth.add_users(request.user, CourseStaffRole(new_location.course_key), request.user)
-                    logging.debug('created all course groups at {0}'.format(new_location))
-
-=======
->>>>>>> edx/master
                 # Send errors to client with stage at which error occurred.
                 except Exception as exception:   # pylint: disable=W0703
                     log.exception(

cms/djangoapps/contentstore/views/tests/test_import_export.py

@@ -14,10 +14,7 @@ from uuid import uuid4
 
 from django.test.utils import override_settings
 from django.conf import settings
-<<<<<<< HEAD
 from contentstore.utils import reverse_course_url
-=======
->>>>>>> edx/master
 
 from xmodule.contentstore.django import _CONTENTSTORE
 from xmodule.modulestore.django import loc_mapper

common/djangoapps/student/views.py

@@ -1868,11 +1868,7 @@ def token(request):
     the token was issued. This will be stored with the user along with
     the id for identification purposes in the backend.
     '''
-<<<<<<< HEAD
     course_id = SlashSeparatedCourseKey.from_deprecated_string(request.GET.get("course_id"))
-=======
-    course_id = request.GET.get("course_id")
->>>>>>> edx/master
     course = course_from_id(course_id)
     dtnow = datetime.datetime.now()
     dtutcnow = datetime.datetime.utcnow()

lms/djangoapps/class_dashboard/dashboard_data.py

@@ -433,12 +433,7 @@ def get_students_opened_subsection(request, csv=False):
     If 'csv' is True, returns a header array, and an array of arrays in the format:
     student names, usernames for CSV download.
     """
-<<<<<<< HEAD
     module_state_key = Location.from_deprecated_string(request.GET.get('module_id'))
-=======
-
-    module_id = request.GET.get('module_id')
->>>>>>> edx/master
     csv = request.GET.get('csv')
 
     # Query for "opened a subsection" students

lms/djangoapps/instructor/views/instructor_dashboard.py

@@ -255,14 +255,9 @@ def _section_metrics(course_key, access):
         'section_key': 'metrics',
         'section_display_name': ('Metrics'),
         'access': access,
-<<<<<<< HEAD
+        'course_id': course_key.to_deprecated_string(),
         'sub_section_display_name': get_section_display_name(course_key),
         'section_has_problem': get_array_section_has_problem(course_key),
-=======
-        'course_id': course_id,
-        'sub_section_display_name': get_section_display_name(course_id),
-        'section_has_problem': get_array_section_has_problem(course_id),
->>>>>>> edx/master
         'get_students_opened_subsection_url': reverse('get_students_opened_subsection'),
         'get_students_problem_grades_url': reverse('get_students_problem_grades'),
         'post_metrics_data_csv_url': reverse('post_metrics_data_csv'),

lms/static/js/staff_debug_actions.js

@@ -114,29 +114,16 @@ var StaffDebug = (function(){
 
 // Register click handlers
 $(document).ready(function() {
-<<<<<<< HEAD
-    $('#staff-debug-reset').click(function() {
+    $('.staff-debug-reset').click(function() {
         StaffDebug.reset($(this).parent().data('location-name'), $(this).parent().data('location'));
         return false;
     });
-    $('#staff-debug-sdelete').click(function() {
+    $('.staff-debug-sdelete').click(function() {
         StaffDebug.sdelete($(this).parent().data('location-name'), $(this).parent().data('location'));
         return false;
     });
-    $('#staff-debug-rescore').click(function() {
-        StaffDebug.rescore($(this).parent().data('location-name'), $(this).parent().data('location'));
-=======
-    $('.staff-debug-reset').click(function() {
-        StaffDebug.reset($(this).data('location'));
-        return false;
-    });
-    $('.staff-debug-sdelete').click(function() {
-        StaffDebug.sdelete($(this).data('location'));
-        return false;
-    });
     $('.staff-debug-rescore').click(function() {
-        StaffDebug.rescore($(this).data('location'));
->>>>>>> edx/master
+        StaffDebug.rescore($(this).parent().data('location-name'), $(this).parent().data('location'));
         return false;
     });
 });

lms/templates/notes.html

@@ -66,19 +66,10 @@
         </section>
         <script>
 
-<<<<<<< HEAD
         //Grab uri of the course
         var parts = window.location.href.split("/"),
             uri = '';
         for (var index = 0; index <= 6; index += 1) uri += parts[index]+"/"; //Get the unit url
-=======
-    	//Grab uri of the course
-    	var parts = window.location.href.split("/"), 
-    		uri = '',
-		courseid;
-	for (var index = 0; index <= 6; index += 1) uri += parts[index]+"/"; //Get the unit url
-	courseid = parts[4] + "/" + parts[5] + "/" + parts[6];
->>>>>>> edx/master
         var pagination = 100,
             is_staff = false,
             options = {
@@ -177,7 +168,7 @@
                   },
             },
             auth: {
-                tokenUrl: location.protocol+'//'+location.host+"/token?course_id="+courseid
+                tokenUrl: location.protocol+'//'+location.host+"/token?course_id=${course.id.to_deprecated_string()}"
             },
             store: {
                 // The endpoint of the store on your server.

lms/templates/staff_problem_info.html

@@ -63,21 +63,11 @@ ${block_content}
       </div>
       <div data-location="${unicode(location)}" data-location-name="${location.name}">
         [
-<<<<<<< HEAD
-        <a href="#" id="staff-debug-reset">${_('Reset Student Attempts')}</a>
+        <a href="#" id="staff-debug-reset" class="staff-debug-reset">${_('Reset Student Attempts')}</a>
         |
-        <a href="#" id="staff-debug-sdelete">${_('Delete Student State')}</a>
+        <a href="#" id="staff-debug-sdelete" class="staff-debug-sdelete">${_('Delete Student State')}</a>
         |
-        <a href="#" id="staff-debug-rescore">${_('Rescore Student Submission')}</a>
-
-=======
-        <a href="#" id="staff-debug-reset" class="staff-debug-reset" data-location="${location.name}">${_('Reset Student Attempts')}</a>
-        |
-        <a href="#" id="staff-debug-sdelete" class="staff-debug-sdelete" data-location="${location.name}">${_('Delete Student State')}</a>
-        |
-        <a href="#" id="staff-debug-rescore" class="staff-debug-rescore" data-location="${location.name}">${_('Rescore Student Submission')}</a>
-        
->>>>>>> edx/master
+        <a href="#" id="staff-debug-rescore" class="staff-debug-rescore">${_('Rescore Student Submission')}</a>
         ]
       </div>
       <div id="result_${location.name}"/>