Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into…

Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-grading-policy

cms/djangoapps/contentstore/utils.py

@@ -27,7 +27,7 @@ def get_course_location_for_item(location):
             raise BaseException('Could not find course at {0}'.format(course_search_location))
 
         if found_cnt > 1:
-            raise BaseException('Found more than one course at {0}. There should only be one!!!'.format(course_search_location))
+            raise BaseException('Found more than one course at {0}. There should only be one!!! Dump = {1}'.format(course_search_location, courses))
 
         location = courses[0].location
 

cms/djangoapps/contentstore/views.py

@@ -10,6 +10,7 @@ import sys
 import time
 import tarfile
 import shutil
+import tempfile
 from datetime import datetime
 from collections import defaultdict
 from uuid import uuid4
@@ -947,6 +948,12 @@ def create_new_course(request):
     if existing_course is not None:
         return HttpResponse(json.dumps({'ErrMsg': 'There is already a course defined with this name.'}))
 
+    course_search_location = ['i4x', dest_location.org, dest_location.course, 'course', None]
+    courses = modulestore().get_items(course_search_location)
+
+    if len(courses) > 0:
+        return HttpResponse(json.dumps({'ErrMsg': 'There is already a course defined with the same organization and course number.'}))
+
     new_course = modulestore('direct').clone_item(template, dest_location)
 
     if display_name is not None:
@@ -982,7 +989,11 @@ def import_course(request, org, course, name):
 
         data_root = path(settings.GITHUB_REPO_ROOT)
 
-        temp_filepath = data_root / filename
+        course_dir = data_root / "{0}-{1}-{2}".format(org, course, name)
+        if not course_dir.isdir():
+            os.mkdir(course_dir)
+
+        temp_filepath = course_dir / filename
 
         logging.debug('importing course to {0}'.format(temp_filepath))
 
@@ -992,32 +1003,42 @@ def import_course(request, org, course, name):
             temp_file.write(chunk)
         temp_file.close()
 
-        # @todo: don't assume the top-level directory that was unziped was the same name (but without .tar.gz)
-        course_dir = filename.replace('.tar.gz', '')
-
         tf = tarfile.open(temp_filepath)
-        if (data_root / course_dir).isdir():
-            shutil.rmtree(data_root / course_dir)
-        tf.extractall(data_root + '/')
+        tf.extractall(course_dir + '/')
+
+        # find the 'course.xml' file
+
+        for r,d,f in os.walk(course_dir):
+            for files in f:
+                if files == 'course.xml':
+                    break
+            if files == 'course.xml':
+                break
+
+        if files != 'course.xml':
+            return HttpResponse(json.dumps({'ErrMsg': 'Could not find the course.xml file in the package.'}))
 
-        os.remove(temp_filepath)    # remove the .tar.gz file
+        logging.debug('found course.xml at {0}'.format(r))
 
+        if r != course_dir:
+            for fname in os.listdir(r):
+                shutil.move(r/fname, course_dir)
 
-        with open(data_root / course_dir / 'course.xml', 'r') as course_file:
+        with open(course_dir / 'course.xml', 'r') as course_file:
             course_data = etree.parse(course_file, parser=edx_xml_parser)
             course_data_root = course_data.getroot()
             course_data_root.set('org', org)
             course_data_root.set('course', course)
             course_data_root.set('url_name', name)
 
-        with open(data_root / course_dir / 'course.xml', 'w') as course_file:
+        with open(course_dir / 'course.xml', 'w') as course_file:
             course_data.write(course_file)
 
         module_store, course_items = import_from_xml(modulestore('direct'), settings.GITHUB_REPO_ROOT,
             [course_dir], load_error_modules=False, static_content_store=contentstore())
 
-        # remove content directory - we *shouldn't* need this any longer :-)
-        shutil.rmtree(data_root / course_dir)
+        # we can blow this away when we're done importing.
+        shutil.rmtree(course_dir)
 
         logging.debug('new course at {0}'.format(course_items[0].location))
 

cms/static/js/base.js

@@ -10,7 +10,8 @@ var $spinner;
 $(document).ready(function() {
     $body = $('body');
     $modal = $('.history-modal');
-    $modalCover = $('.modal-cover');
+    $modalCover = $('<div class="modal-cover">');
+    $body.append($modalCover);
     $newComponentItem = $('.new-component-item');
     $newComponentTypePicker = $('.new-component');
     $newComponentTemplatePickers = $('.new-component-templates');
@@ -102,8 +103,35 @@ $(document).ready(function() {
     // pretty wacky stuff to happen
     $('.file-input').bind('change', startUpload);
     $('.upload-modal .choose-file-button').bind('click', showFileSelectionMenu);
+
+    $body.on('click', '.section-published-date .edit-button', editSectionPublishDate);
+    $body.on('click', '.section-published-date .schedule-button', editSectionPublishDate);
+    $body.on('click', '.edit-subsection-publish-settings .save-button', saveSetSectionScheduleDate);
+    $body.on('click', '.edit-subsection-publish-settings .cancel-button', hideModal)
+    $body.on('change', '.edit-subsection-publish-settings .start-date', function() {
+        if($('.edit-subsection-publish-settings').find('.start-time').val() == '') {
+            $('.edit-subsection-publish-settings').find('.start-time').val('12:00am');    
+        }
+    });
+    $('.edit-subsection-publish-settings').on('change', '.start-date, .start-time', function() {
+        $('.edit-subsection-publish-settings').find('.save-button').show();
+    });
 });
 
+function editSectionPublishDate(e) {
+    e.preventDefault();
+    $modal = $('.edit-subsection-publish-settings').show();
+    $modal = $('.edit-subsection-publish-settings').show();
+    $modal.attr('data-id', $(this).attr('data-id'));
+    $modal.find('.start-date').val($(this).attr('data-date'));
+    $modal.find('.start-time').val($(this).attr('data-time'));
+    if($modal.find('.start-date').val() == '' && $modal.find('.start-time').val() == '') {
+        $modal.find('.save-button').hide();
+    }    
+    $modal.find('.section-name').html('"' + $(this).closest('.courseware-section').find('.section-name-span').text() + '"');
+    $modalCover.show();
+}
+
 function showImportSubmit(e) {
     var filepath = $(this).val();
     if(filepath.substr(filepath.length - 6, 6) == 'tar.gz') {
@@ -387,7 +415,9 @@ function _deleteItem($el) {
 
 function showUploadModal(e) {
     e.preventDefault();
-    $('.upload-modal').show();
+    $modal = $('.upload-modal').show();
+    $('.file-input').bind('change', startUpload);
+    $('.upload-modal .choose-file-button').bind('click', showFileSelectionMenu);
     $modalCover.show();
 }
 
@@ -448,8 +478,10 @@ function markAsLoaded() {
 }    
 
 function hideModal(e) {
-    e.preventDefault();
-    $('.modal').hide();
+    if(e) {
+        e.preventDefault();
+    }
+    $modal.hide();
     $modalCover.hide();
 }
 
@@ -686,7 +718,7 @@ function saveEditSectionName(e) {
     e.preventDefault();
 
     id = $(this).closest("section.courseware-section").data("id");
-    display_name = $(this).prev('.edit-section-name').val();
+    display_name = $.trim($(this).prev('.edit-section-name').val());
 
     if (display_name == '') {
         alert("You must specify a name before saving.")
@@ -726,15 +758,15 @@ function cancelSetSectionScheduleDate(e) {
 function saveSetSectionScheduleDate(e) {
     e.preventDefault();
 
-    input_date = $(this).siblings('input.date').val();
-    input_time = $(this).siblings('input.time').val();
+    input_date = $('.edit-subsection-publish-settings .start-date').val();
+    input_time = $('.edit-subsection-publish-settings .start-time').val();
 
     start = getEdxTimeFromDateTimeVals(input_date, input_time);
 
-    id = $(this).closest("section.courseware-section").data("id");
+    id = $modal.attr('data-id');
     var $_this = $(this);
 
-        // call into server to commit the new order
+    // call into server to commit the new order
     $.ajax({
         url: "/save_item",
         type: "POST",
@@ -743,7 +775,18 @@ function saveSetSectionScheduleDate(e) {
         data:JSON.stringify({ 'id' : id, 'metadata' : {'start' : start}, 'data': null, 'children' : null})
     }).success(function()
     {
-        alert('Your changes have been saved.');
-        location.reload();     
+        var $thisSection = $('.courseware-section[data-id="' + id + '"]');
+        $thisSection.find('.section-published-date').html('<span class="published-status"><strong>Will Release:</strong> ' + input_date + ' at ' + input_time + '</span><a href="#" class="edit-button" data-date="' + input_date + '" data-time="' + input_time + '" data-id="' + id + '">Edit</a>');
+        $thisSection.find('.section-published-date').animate({
+            'background-color': 'rgb(182,37,104)'
+        }, 300).animate({
+            'background-color': '#edf1f5'
+        }, 300).animate({
+            'background-color': 'rgb(182,37,104)'
+        }, 300).animate({
+            'background-color': '#edf1f5'
+        }, 300);
+        
+        hideModal();
     });
 }

cms/static/sass/_courseware.scss

@@ -28,16 +28,72 @@ input.courseware-unit-search-input {
 
 	&.collapsed {
 		padding-bottom: 0;
+	}
 
-		header {
-			height: 47px;
+	label {
+		float: left;
+		line-height: 29px;
+	}
+
+	.datepair {
+		float: left;
+		margin-left: 10px;
+	}
+
+	.section-published-date {
+		position: absolute;
+		top: 19px;
+		right: 90px;
+		padding: 4px 10px;
+		border-radius: 3px;
+		background: $lightGrey;
+		text-align: right;
+
+		.published-status {
+			font-size: 12px;
+			margin-right: 15px;
+
+			strong {
+				font-weight: 700;
+			}
 		}
-		
-		h4 {
-			display: none !important;
+
+		.schedule-button {
+			@include blue-button;
+		}
+
+		.edit-button {
+			@include blue-button;
+		}
+
+		.schedule-button,
+		.edit-button {
+			font-size: 11px;
+			padding: 3px 15px 5px;
 		}
 	}
 
+	.datepair .date,
+	.datepair .time {
+		padding-left: 0;
+		padding-right: 0;
+		border: none;
+		background: none;
+		@include box-shadow(none);
+		font-size: 13px;
+		font-weight: 700;
+		color: $blue;
+		cursor: pointer;
+	}
+
+	.datepair .date {
+		width: 80px;
+	}
+
+	.datepair .time {
+		width: 65px;
+	}
+
 	&.collapsed .subsection-list,
 	.collapsed .subsection-list,
 	.collapsed > ol {
@@ -45,15 +101,15 @@ input.courseware-unit-search-input {
 	}
 
 	header {
-		height: 67px;
+		height: 75px;
 
 		.item-details {
 			float: left;
-			padding: 10px 0 0;
+			padding: 21px 0 0;
 		}
 
 		.item-actions {			
-			margin-top: 11px;
+			margin-top: 21px;
 			margin-right: 12px;
 
 			.edit-button,
@@ -64,7 +120,7 @@ input.courseware-unit-search-input {
 
 		.expand-collapse-icon {
 			float: left;
-			margin: 16px 6px 16px 16px;
+			margin: 29px 6px 16px 16px;
 			@include transition(none);
 		}
 
@@ -74,11 +130,37 @@ input.courseware-unit-search-input {
 	}
 
 	h3 {
-		font-size: 16px;
+		font-size: 19px;
 		font-weight: 700;
 		color: $blue;
 	}
 
+	.section-name-span {
+		cursor: pointer;
+		@include transition(color .15s);
+
+		&:hover {
+			color: $orange;
+		}
+	}
+
+	.section-name-edit {
+		input {
+			font-size: 16px;	
+		}
+		
+		.save-button {
+			@include blue-button;
+			padding: 7px 20px 7px;
+			margin-right: 5px;
+		}
+
+		.cancel-button {
+			@include white-button;
+			padding: 7px 20px 7px;
+		}
+	}
+
 	h4 {
 		font-size: 12px;
 		color: #878e9d;
@@ -161,3 +243,57 @@ input.courseware-unit-search-input {
 .preview {
 	background: url(../img/preview.jpg) center top no-repeat;
 }
+
+.edit-subsection-publish-settings {
+	display: none;
+	position: fixed;
+	top: 100px;
+	left: 50%;
+	z-index: 99999;
+	width: 600px;
+	margin-left: -300px;
+	background: #fff;
+	text-align: center;
+
+	.settings {
+		padding: 40px;
+	}
+
+	h3 {
+		font-size: 34px;
+		font-weight: 300;
+	}
+
+	.picker {
+		margin: 30px 0 65px;
+	}
+
+	.description {
+		margin-top: 30px;
+		font-size: 14px;
+		line-height: 20px;
+	}
+
+	strong {
+		font-weight: 700;
+	}
+
+	.start-date,
+	.start-time {
+		font-size: 19px;
+	}
+
+	.save-button {
+		@include blue-button;
+		margin-right: 10px;
+	}
+
+	.cancel-button {
+		@include white-button;
+	}
+
+	.save-button,
+	.cancel-button {
+		font-size: 16px;
+	}
+}
\ No newline at end of file

cms/templates/manage_users.html

@@ -21,7 +21,7 @@
       %if allow_actions:
       <div class="new-user-form">
         <label>email: </label><input type="text" id="email" class="email-input" autocomplete="off" placeholder="email@example.com">
-        <a href="#" id="add_user" class="add-button">save</a>
+        <a href="#" id="add_user" class="add-button">add user</a>
         <a href="#" class="cancel-button">cancel</a>
       </div>
       %endif

cms/templates/overview.html

@@ -56,6 +56,20 @@
 </%block>
 
 <%block name="content">
+  <div class="edit-subsection-publish-settings">
+    <div class="settings">
+      <h3>Section Release Date</h3>
+      <div class="picker datepair">
+        <input class="start-date date" type="text" name="start_date" value="" placeholder="MM/DD/YYYY" class="date" size='15' autocomplete="off"/>
+        <input class="start-time time" type="text" name="start_time" value="" placeholder="HH:MM" class="time" size='10' autocomplete="off"/>
+        <div class="description">
+          <p>On the date set above, this section – <strong class="section-name"></strong> – will be released to students along with the 5 subsections within it. Any units marked private will only be visible to admins.</p>
+        </div>
+      </div>
+      <a href="#" class="save-button">Save</a><a href="#" class="cancel-button">Cancel</a>
+    </div>
+  </div>
+
   <div class="main-wrapper">
     <div class="inner-wrapper">
       <h1>Courseware</h1>
@@ -74,23 +88,19 @@
                   <a href="#" class="save-button edit-section-name-save">Save</a><a href="#" class="cancel-button edit-section-name-cancel">Cancel</a>
                 </div>
               </h3>
-              <h4 class='section-published-date'>
+              <div class="section-published-date">
                 <%
                   start_date = datetime.fromtimestamp(mktime(section.start)) if section.start is not None else None
                   start_date_str = start_date.strftime('%m/%d/%Y') if start_date is not None else ''
                   start_time_str = start_date.strftime('%H:%M') if start_date is not None else ''
                 %>
                 %if start_date is None:
-                  <strong>Unscheduled:</strong> 
-                  <a href="#" class="set-publish-date">click here to set</a>
+                  <span class="published-status">This section has not been released.</span>
+                  <a href="#" class="schedule-button" data-date="" data-time="" data-id="${section.location}">Schedule</a>
                 %else:
-                  <strong>${start_date_str} at ${start_time_str}</strong> <a href="#" class="set-publish-date">click here to edit</a>
+                  <span class="published-status"><strong>Will Release:</strong> ${start_date_str} at ${start_time_str}</span>
+                  <a href="#" class="edit-button" data-date="${start_date_str}" data-time="${start_time_str}" data-id="${section.location}">Edit</a>
                 %endif
-              </h4>
-              <div class="datepair" data-language="javascript" style="display: none">
-                <input type="text" name="start_date" value="${start_date_str}" placeholder="MM/DD/YYYY" class="date" size='15' autocomplete="off"/>
-                <input type="text" name="start_time" value="${start_time_str}" placeholder="HH:MM" class="time" size='10' autocomplete="off"/> 
-                <a href="#" class="save-button edit-section-start-save">Save</a><a href="#" class="cancel-button edit-section-start-cancel">Cancel</a>
               </div>
             </div>
             <div class="item-actions">

common/djangoapps/external_auth/djangostore.py

+"""A openid store using django cache"""
+
+from openid.store.interface import OpenIDStore
+from openid.store import nonce
+
+from django.core.cache import cache
+
+import logging
+import time
+
+DEFAULT_ASSOCIATIONS_TIMEOUT = 60
+DEFAULT_NONCE_TIMEOUT = 600
+
+ASSOCIATIONS_KEY_PREFIX = 'openid.provider.associations.'
+NONCE_KEY_PREFIX = 'openid.provider.nonce.'
+
+log = logging.getLogger('DjangoOpenIDStore')
+
+
+def get_url_key(server_url):
+    key = ASSOCIATIONS_KEY_PREFIX + server_url
+    return key
+
+
+def get_nonce_key(server_url, timestamp, salt):
+    key = '{prefix}{url}.{ts}.{salt}'.format(prefix=NONCE_KEY_PREFIX,
+                                             url=server_url,
+                                             ts=timestamp,
+                                             salt=salt)
+    return key
+
+
+class DjangoOpenIDStore(OpenIDStore):
+    def __init__(self):
+        log.info('DjangoStore cache:' + str(cache.__class__))
+
+    def storeAssociation(self, server_url, assoc):
+        key = get_url_key(server_url)
+
+        log.info('storeAssociation {0}'.format(key))
+
+        associations = cache.get(key, {})
+        associations[assoc.handle] = assoc
+
+        cache.set(key, associations, DEFAULT_ASSOCIATIONS_TIMEOUT)
+
+    def getAssociation(self, server_url, handle=None):
+        key = get_url_key(server_url)
+
+        log.info('getAssociation {0}'.format(key))
+
+        associations = cache.get(key, {})
+
+        assoc = None
+
+        if handle is None:
+            # get best association
+            valid_assocs = [a for a in associations if a.getExpiresIn() > 0]
+            if valid_assocs:
+                valid_assocs.sort(lambda a: a.getExpiresIn(), reverse=True)
+                assoc = valid_assocs.sort[0]
+        else:
+            assoc = associations.get(handle)
+
+        # check expiration and remove if it has expired
+        if assoc and assoc.getExpiresIn() <= 0:
+            if handle is None:
+                cache.delete(key)
+            else:
+                associations.pop(handle)
+                cache.set(key, associations, DEFAULT_ASSOCIATIONS_TIMEOUT)
+            assoc = None
+
+        return assoc
+
+    def removeAssociation(self, server_url, handle):
+        key = get_url_key(server_url)
+
+        log.info('removeAssociation {0}'.format(key))
+
+        associations = cache.get(key, {})
+
+        removed = False
+
+        if associations:
+            if handle is None:
+                cache.delete(key)
+                removed = True
+            else:
+                assoc = associations.pop(handle)
+                if assoc:
+                    cache.set(key, associations, DEFAULT_ASSOCIATIONS_TIMEOUT)
+                    removed = True
+
+        return removed
+
+    def useNonce(self, server_url, timestamp, salt):
+        key = get_nonce_key(server_url, timestamp, salt)
+
+        log.info('useNonce {0}'.format(key))
+
+        if abs(timestamp - time.time()) > nonce.SKEW:
+            return False
+
+        anonce = cache.get(key)
+
+        found = False
+
+        if anonce is None:
+            cache.set(key, '-', DEFAULT_NONCE_TIMEOUT)
+            found = False
+        else:
+            found = True
+
+        return found
+
+    def cleanupNonces(self):
+        # not necesary, keys will timeout
+        return 0
+
+    def cleanupAssociations(self):
+        # not necesary, keys will timeout
+        return 0

common/djangoapps/external_auth/views.py

@@ -7,6 +7,7 @@ import string
 import fnmatch
 
 from external_auth.models import ExternalAuthMap
+from external_auth.djangostore import DjangoOpenIDStore
 
 from django.conf import settings
 from django.contrib.auth import REDIRECT_FIELD_NAME, authenticate, login
@@ -30,7 +31,6 @@ from openid.consumer.consumer import SUCCESS
 
 from openid.server.server import Server
 from openid.server.trustroot import TrustRoot
-from openid.store.filestore import FileOpenIDStore
 from openid.extensions import ax, sreg
 
 import student.views as student_views
@@ -307,10 +307,7 @@ def get_xrds_url(resource, request):
     """
     Return the XRDS url for a resource
     """
-    host = request.META['HTTP_HOST']
-
-    if not host.endswith('edx.org'):
-        return None
+    host = request.get_host()
 
     location = host + '/openid/provider/' + resource + '/'
 
@@ -332,6 +329,8 @@ def add_openid_simple_registration(request, response, data):
                 sreg_data['email'] = data['email']
             elif field == 'fullname' and 'fullname' in data:
                 sreg_data['fullname'] = data['fullname']
+            elif field == 'nickname' and 'nickname' in data:
+                sreg_data['nickname'] = data['nickname']
 
         # construct sreg response
         sreg_response = sreg.SRegResponse.extractResponse(sreg_request,
@@ -436,7 +435,7 @@ def provider_login(request):
         return default_render_failure(request, "Invalid OpenID request")
 
     # initialize store and server
-    store = FileOpenIDStore('/tmp/openid_provider')
+    store = DjangoOpenIDStore()
     server = Server(store, endpoint)
 
     # handle OpenID request
@@ -525,13 +524,22 @@ def provider_login(request):
             url = endpoint + urlquote(user.username)
             response = openid_request.answer(True, None, url)
 
-            return provider_respond(server,
-                                    openid_request,
-                                    response,
-                                    {
-                                        'fullname': profile.name,
-                                        'email': user.email
-                                    })
+            # TODO: for CS50 we are forcibly returning the username
+            # instead of fullname. In the OpenID simple registration
+            # extension, we don't have to return any fields we don't
+            # want to, even if they were marked as required by the
+            # Consumer. The behavior of what to do when there are
+            # missing fields is up to the Consumer. The proper change
+            # should only return the username, however this will likely
+            # break the CS50 client. Temporarily we will be returning
+            # username filling in for fullname in addition to username 
+            # as sreg nickname.
+            results = {
+                'nickname': user.username,
+                'email': user.email,
+                'fullname': user.username
+                }
+            return provider_respond(server, openid_request, response, results)
 
         request.session['openid_error'] = True
         msg = "Login failed - Account not active for user {0}".format(username)

common/djangoapps/status/__init__.py

+

common/djangoapps/status/status.py

+"""
+A tiny app that checks for a status message.
+"""
+
+from django.conf import settings
+import json
+import logging
+import os
+import sys
+
+log = logging.getLogger(__name__)
+
+def get_site_status_msg(course_id):
+    """
+    Look for a file settings.STATUS_MESSAGE_PATH.  If found, read it,
+    parse as json, and do the following:
+
+    * if there is a key 'global', include that in the result list.
+    * if course is not None, and there is a key for course.id, add that to the result list.
+    * return "<br/>".join(result)
+
+    Otherwise, return None.
+
+    If something goes wrong, returns None.  ("is there a status msg?" logic is
+    not allowed to break the entire site).
+    """
+    try:
+        if os.path.isfile(settings.STATUS_MESSAGE_PATH):
+            with open(settings.STATUS_MESSAGE_PATH) as f:
+                content = f.read()
+        else:
+            return None
+
+        status_dict = json.loads(content)
+        msg = status_dict.get('global', None)
+        if course_id in status_dict:
+            msg = msg + "<br>" if msg else ''
+            msg += status_dict[course_id]
+
+        return msg
+    except:
+        log.exception("Error while getting a status message.")
+        return None

common/djangoapps/status/tests.py

+from django.conf import settings
+from django.test import TestCase
+import os
+from override_settings import override_settings
+from tempfile import NamedTemporaryFile
+
+from status import get_site_status_msg
+
+# Get a name where we can put test files
+TMP_FILE = NamedTemporaryFile(delete=False)
+TMP_NAME = TMP_FILE.name
+# Close it--we just want the path.
+TMP_FILE.close()
+
+
+@override_settings(STATUS_MESSAGE_PATH=TMP_NAME)
+class TestStatus(TestCase):
+    """Test that the get_site_status_msg function does the right thing"""
+
+    no_file = None
+
+    invalid_json = """{
+        "global" : "Hello, Globe",
+        }"""
+
+    global_only = """{
+        "global" : "Hello, Globe"
+        }"""
+
+    toy_only = """{
+        "edX/toy/2012_Fall" : "A toy story"
+        }"""
+
+    global_and_toy = """{
+        "global" : "Hello, Globe",
+        "edX/toy/2012_Fall" : "A toy story"
+        }"""
+
+
+    # json to use, expected results for course=None (e.g. homepage),
+    # for toy course, for full course.  Note that get_site_status_msg
+    # is supposed to return global message even if course=None.  The
+    # template just happens to not display it outside the courseware
+    # at the moment...
+    checks = [
+        (no_file, None, None, None),
+        (invalid_json, None, None, None),
+        (global_only, "Hello, Globe", "Hello, Globe", "Hello, Globe"),
+        (toy_only, None, "A toy story", None),
+        (global_and_toy, "Hello, Globe", "Hello, Globe<br>A toy story", "Hello, Globe"),
+        ]
+
+    def setUp(self):
+        """
+        Fake course ids, since we don't have to have full django
+        settings (common tests run without the lms settings imported)
+        """
+        self.full_id = 'edX/full/2012_Fall'
+        self.toy_id = 'edX/toy/2012_Fall'
+
+    def create_status_file(self, contents):
+        """
+        Write contents to settings.STATUS_MESSAGE_PATH.
+        """
+        with open(settings.STATUS_MESSAGE_PATH, 'w') as f:
+            f.write(contents)
+
+    def remove_status_file(self):
+        """Delete the status file if it exists"""
+        if os.path.exists(settings.STATUS_MESSAGE_PATH):
+            os.remove(settings.STATUS_MESSAGE_PATH)
+
+    def tearDown(self):
+        self.remove_status_file()
+
+    def test_get_site_status_msg(self):
+        """run the tests"""
+        for (json_str, exp_none, exp_toy, exp_full) in self.checks:
+
+            self.remove_status_file()
+            if json_str:
+                self.create_status_file(json_str)
+
+            print "checking results for {0}".format(json_str)
+            print "course=None:"
+            self.assertEqual(get_site_status_msg(None), exp_none)
+            print "course=toy:"
+            self.assertEqual(get_site_status_msg(self.toy_id), exp_toy)
+            print "course=full:"
+            self.assertEqual(get_site_status_msg(self.full_id), exp_full)

common/djangoapps/student/management/commands/set_staff.py

+from django.contrib.auth.models import User
+from django.core.management.base import BaseCommand, CommandError
+import re
+
+
+class Command(BaseCommand):
+
+    args = '<user/email user/email ...>'
+    help = """
+    This command will set isstaff to true for one or more users.
+    Lookup by username or email address, assumes usernames
+    do not look like email addresses.
+    """
+
+    def handle(self, *args, **kwargs):
+
+        if len(args) < 1:
+            print Command.help
+            return
+
+        for user in args:
+
+            if re.match('[^@]+@[^@]+\.[^@]+', user):
+                try:
+                    v = User.objects.get(email=user)
+                except:
+                    raise CommandError("User {0} does not exist".format(
+                        user))
+            else:
+                try:
+                    v = User.objects.get(username=user)
+                except:
+                    raise CommandError("User {0} does not exist".format(
+                        user))
+
+            v.is_staff = True
+            v.save()

common/djangoapps/student/views.py

@@ -262,10 +262,15 @@ def login_user(request, error=""):
         try_change_enrollment(request)
 
         return HttpResponse(json.dumps({'success': True}))
-
-    log.warning("Login failed - Account not active for user {0}".format(username))
+    
+    log.warning("Login failed - Account not active for user {0}, resending activation".format(username))
+    
+    reactivation_email_for_user(user)
+    not_activated_msg = "This account has not been activated. We have " + \
+                        "sent another activation message. Please check your " + \
+                        "e-mail for the activation instructions."
     return HttpResponse(json.dumps({'success': False,
-                                    'value': 'This account has not been activated. Please check your e-mail for the activation instructions.'}))
+                                    'value': not_activated_msg}))
 
 
 @ensure_csrf_cookie
@@ -517,6 +522,17 @@ def password_reset(request):
     ''' Attempts to send a password reset e-mail. '''
     if request.method != "POST":
         raise Http404
+    
+    # By default, Django doesn't allow Users with is_active = False to reset their passwords,
+    # but this bites people who signed up a long time ago, never activated, and forgot their 
+    # password. So for their sake, we'll auto-activate a user for whome password_reset is called.
+    try:
+        user = User.objects.get(email=request.POST['email'])
+        user.is_active = True
+        user.save()
+    except:
+        log.exception("Tried to auto-activate user to enable password reset, but failed.")
+    
     form = PasswordResetForm(request.POST)
     if form.is_valid():
         form.save(use_https = request.is_secure(),
@@ -529,7 +545,6 @@ def password_reset(request):
         return HttpResponse(json.dumps({'success': False,
                                         'error': 'Invalid e-mail'}))
 
-
 @ensure_csrf_cookie
 def reactivation_email(request):
     ''' Send an e-mail to reactivate a deactivated account, or to
@@ -540,25 +555,22 @@ def reactivation_email(request):
     except User.DoesNotExist:
         return HttpResponse(json.dumps({'success': False,
                                         'error': 'No inactive user with this e-mail exists'}))
+    return reactivation_email_for_user(user)
 
-    if user.is_active:
-        return HttpResponse(json.dumps({'success': False,
-                                        'error': 'User is already active'}))
-
+def reactivation_email_for_user(user):
     reg = Registration.objects.get(user=user)
-    reg.register(user)
 
-    d = {'name': UserProfile.get(user=user).name,
-       'key': r.activation_key}
+    d = {'name': user.profile.name,
+         'key': reg.activation_key}
 
-    subject = render_to_string('reactivation_email_subject.txt', d)
+    subject = render_to_string('emails/activation_email_subject.txt', d)
     subject = ''.join(subject.splitlines())
-    message = render_to_string('reactivation_email.txt', d)
+    message = render_to_string('emails/activation_email.txt', d)
 
     res = user.email_user(subject, message, settings.DEFAULT_FROM_EMAIL)
 
     return HttpResponse(json.dumps({'success': True}))
-
+    
 
 @ensure_csrf_cookie
 def change_email_request(request):
@@ -642,9 +654,12 @@ def confirm_email_change(request, key):
     meta['old_emails'].append([user.email, datetime.datetime.now().isoformat()])
     up.set_meta(meta)
     up.save()
+    # Send it to the old email...
+    user.email_user(subject, message, settings.DEFAULT_FROM_EMAIL)
     user.email = pec.new_email
     user.save()
     pec.delete()
+    # And send it to the new email...
     user.email_user(subject, message, settings.DEFAULT_FROM_EMAIL)
 
     return render_to_response("email_change_successful.html", d)
@@ -665,9 +680,12 @@ def change_name_request(request):
     pnc.rationale = request.POST['rationale']
     if len(pnc.new_name) < 2:
         return HttpResponse(json.dumps({'success': False, 'error': 'Name required'}))
-    if len(pnc.rationale) < 2:
-        return HttpResponse(json.dumps({'success': False, 'error': 'Rationale required'}))
     pnc.save()
+
+    # The following automatically accepts name change requests. Remove this to
+    # go back to the old system where it gets queued up for admin approval.
+    accept_name_change_by_id(pnc.id)
+
     return HttpResponse(json.dumps({'success': True}))
 
 
@@ -702,14 +720,9 @@ def reject_name_change(request):
     return HttpResponse(json.dumps({'success': True}))
 
 
-@ensure_csrf_cookie
-def accept_name_change(request):
-    ''' JSON: Name change process. Course staff clicks 'accept' on a given name change '''
-    if not request.user.is_staff:
-        raise Http404
-
+def accept_name_change_by_id(id):
     try:
-        pnc = PendingNameChange.objects.get(id=int(request.POST['id']))
+        pnc = PendingNameChange.objects.get(id=id)
     except PendingNameChange.DoesNotExist:
         return HttpResponse(json.dumps({'success': False, 'error': 'Invalid ID'}))
 
@@ -728,3 +741,17 @@ def accept_name_change(request):
     pnc.delete()
 
     return HttpResponse(json.dumps({'success': True}))
+
+
+@ensure_csrf_cookie
+def accept_name_change(request):
+    ''' JSON: Name change process. Course staff clicks 'accept' on a given name change 
+    
+    We used this during the prototype but now we simply record name changes instead
+    of manually approving them. Still keeping this around in case we want to go
+    back to this approval method.
+    '''
+    if not request.user.is_staff:
+        raise Http404
+
+    return accept_name_change_by_id(int(request.POST['id']))

common/lib/capa/capa/calc.py

@@ -48,7 +48,7 @@ general_whitespace = re.compile('[^\w]+')
 
 
 def check_variables(string, variables):
-    '''  Confirm the only variables in string are defined.
+    '''Confirm the only variables in string are defined.
 
     Pyparsing uses a left-to-right parser, which makes the more
     elegant approach pretty hopeless.
@@ -56,7 +56,8 @@ def check_variables(string, variables):
     achar = reduce(lambda a,b:a|b ,map(Literal,alphas)) # Any alphabetic character
     undefined_variable = achar + Word(alphanums)
     undefined_variable.setParseAction(lambda x:UndefinedVariable("".join(x)).raiseself())
-    varnames = varnames | undefined_variable'''
+    varnames = varnames | undefined_variable
+    '''
     possible_variables = re.split(general_whitespace, string)  # List of all alnums in string
     bad_variables = list()
     for v in possible_variables:
@@ -71,7 +72,8 @@ def check_variables(string, variables):
 
 
 def evaluator(variables, functions, string, cs=False):
-    ''' Evaluate an expression. Variables are passed as a dictionary
+    '''
+    Evaluate an expression. Variables are passed as a dictionary
     from string to value. Unary functions are passed as a dictionary
     from string to function. Variables must be floats.
     cs: Case sensitive
@@ -108,6 +110,7 @@ def evaluator(variables, functions, string, cs=False):
 
     if string.strip() == "":
         return float('nan')
+
     ops = {"^": operator.pow,
             "*": operator.mul,
             "/": operator.truediv,
@@ -169,14 +172,19 @@ def evaluator(variables, functions, string, cs=False):
     def func_parse_action(x):
         return [all_functions[x[0]](x[1])]
 
-    number_suffix = reduce(lambda a, b: a | b, map(Literal, suffixes.keys()), NoMatch())  # SI suffixes and percent
+    # SI suffixes and percent
+    number_suffix = reduce(lambda a, b: a | b, map(Literal, suffixes.keys()), NoMatch())
     (dot, minus, plus, times, div, lpar, rpar, exp) = map(Literal, ".-+*/()^")
 
     number_part = Word(nums)
-    inner_number = (number_part + Optional("." + number_part)) | ("." + number_part)  # 0.33 or 7 or .34
-    number = Optional(minus | plus) + inner_number + \
-        Optional(CaselessLiteral("E") + Optional("-") + number_part) + \
-        Optional(number_suffix)  # 0.33k or -17
+
+    # 0.33 or 7 or .34
+    inner_number = (number_part + Optional("." + number_part)) | ("." + number_part)
+
+    # 0.33k or -17
+    number = (Optional(minus | plus) + inner_number
+              + Optional(CaselessLiteral("E") + Optional("-") + number_part)
+              + Optional(number_suffix))
     number = number.setParseAction(number_parse_action)  # Convert to number
 
     # Predefine recursive variables
@@ -201,9 +209,11 @@ def evaluator(variables, functions, string, cs=False):
         varnames.setParseAction(lambda x: map(lambda y: all_variables[y], x))
     else:
         varnames = NoMatch()
+
     # Same thing for functions.
     if len(all_functions) > 0:
-        funcnames = sreduce(lambda x, y: x | y, map(lambda x: CasedLiteral(x), all_functions.keys()))
+        funcnames = sreduce(lambda x, y: x | y,
+                            map(lambda x: CasedLiteral(x), all_functions.keys()))
         function = funcnames + lpar.suppress() + expr + rpar.suppress()
         function.setParseAction(func_parse_action)
     else:

common/lib/capa/capa/chem/__init__.py

+

common/lib/capa/capa/correctmap.py

@@ -5,23 +5,26 @@
 
 
 class CorrectMap(object):
-    '''
+    """
     Stores map between answer_id and response evaluation result for each question
     in a capa problem.  The response evaluation result for each answer_id includes
     (correctness, npoints, msg, hint, hintmode).
 
     - correctness : either 'correct' or 'incorrect'
     - npoints     : None, or integer specifying number of points awarded for this answer_id
-    - msg         : string (may have HTML) giving extra message response (displayed below textline or textbox)
-    - hint        : string (may have HTML) giving optional hint (displayed below textline or textbox, above msg)
+    - msg         : string (may have HTML) giving extra message response
+                    (displayed below textline or textbox)
+    - hint        : string (may have HTML) giving optional hint
+                    (displayed below textline or textbox, above msg)
     - hintmode    : one of (None,'on_request','always') criteria for displaying hint
     - queuestate  : Dict {key:'', time:''} where key is a secret string, and time is a string dump
                     of a DateTime object in the format '%Y%m%d%H%M%S'. Is None when not queued
 
     Behaves as a dict.
-    '''
+    """
     def __init__(self, *args, **kwargs):
-        self.cmap = dict()		# start with empty dict
+        # start with empty dict
+        self.cmap = dict()
         self.items = self.cmap.items
         self.keys = self.cmap.keys
         self.set(*args, **kwargs)
@@ -33,7 +36,15 @@ class CorrectMap(object):
         return self.cmap.__iter__()
 
     # See the documentation for 'set_dict' for the use of kwargs
-    def set(self, answer_id=None, correctness=None, npoints=None, msg='', hint='', hintmode=None, queuestate=None, **kwargs):
+    def set(self,
+            answer_id=None,
+            correctness=None,
+            npoints=None,
+            msg='',
+            hint='',
+            hintmode=None,
+            queuestate=None, **kwargs):
+
         if answer_id is not None:
             self.cmap[answer_id] = {'correctness': correctness,
                                     'npoints': npoints,
@@ -56,12 +67,13 @@ class CorrectMap(object):
         '''
         Set internal dict of CorrectMap to provided correct_map dict
 
-        correct_map is saved by LMS as a plaintext JSON dump of the correctmap dict. This means that
-        when the definition of CorrectMap (e.g. its properties) are altered, existing correct_map dict
-        not coincide with the newest CorrectMap format as defined by self.set.
+        correct_map is saved by LMS as a plaintext JSON dump of the correctmap dict. This
+        means that when the definition of CorrectMap (e.g. its properties) are altered,
+        an existing correct_map dict not coincide with the newest CorrectMap format as
+        defined by self.set.
 
         For graceful migration, feed the contents of each correct map to self.set, rather than
-        making a direct copy of the given correct_map dict. This way, the common keys between 
+        making a direct copy of the given correct_map dict. This way, the common keys between
         the incoming correct_map dict and the new CorrectMap instance will be written, while
         mismatched keys will be gracefully ignored.
 
@@ -69,14 +81,20 @@ class CorrectMap(object):
             If correct_map is a one-level dict, then convert it to the new dict of dicts format.
         '''
         if correct_map and not (type(correct_map[correct_map.keys()[0]]) == dict):
-            self.__init__()	                                  # empty current dict
-            for k in correct_map: self.set(k, correct_map[k]) # create new dict entries
+            # empty current dict
+            self.__init__()
+
+            # create new dict entries
+            for k in correct_map:
+                self.set(k, correct_map[k])
         else:
             self.__init__()
-            for k in correct_map: self.set(k, **correct_map[k])
+            for k in correct_map:
+                self.set(k, **correct_map[k])
 
     def is_correct(self, answer_id):
-        if answer_id in self.cmap: return self.cmap[answer_id]['correctness'] == 'correct'
+        if answer_id in self.cmap:
+            return self.cmap[answer_id]['correctness'] == 'correct'
         return None
 
     def is_queued(self, answer_id):
@@ -94,14 +112,18 @@ class CorrectMap(object):
             return npoints
         elif self.is_correct(answer_id):
             return 1
-        return 0 # if not correct and no points have been assigned, return 0
+         # if not correct and no points have been assigned, return 0
+        return 0
 
     def set_property(self, answer_id, property, value):
-        if answer_id in self.cmap: self.cmap[answer_id][property] = value
-        else: self.cmap[answer_id] = {property: value}
+        if answer_id in self.cmap:
+            self.cmap[answer_id][property] = value
+        else:
+            self.cmap[answer_id] = {property: value}
 
     def get_property(self, answer_id, property, default=None):
-        if answer_id in self.cmap: return self.cmap[answer_id].get(property, default)
+        if answer_id in self.cmap:
+            return self.cmap[answer_id].get(property, default)
         return default
 
     def get_correctness(self, answer_id):

common/lib/capa/capa/eia.py

-""" Standard resistor codes.
+"""
+Standard resistor codes.
 http://en.wikipedia.org/wiki/Electronic_color_code
 """
 E6 = [10, 15, 22, 33, 47, 68]
+
 E12 = [10, 12, 15, 18, 22, 27, 33, 39, 47, 56, 68, 82]
+
 E24 = [10, 12, 15, 18, 22, 27, 33, 39, 47, 56, 68, 82, 11, 13, 16, 20, 24, 30, 36, 43, 51, 62, 75, 91]
+
 E48 = [100, 121, 147, 178, 215, 261, 316, 383, 464, 562, 681, 825, 105, 127, 154, 187, 226, 274, 332, 402, 487, 590, 715, 866, 110, 133, 162, 196, 237, 287, 348, 422, 511, 619, 750, 909, 115, 140, 169, 205, 249, 301, 365, 442, 536, 649, 787, 953]
+
 E96 = [100, 121, 147, 178, 215, 261, 316, 383, 464, 562, 681, 825, 102, 124, 150, 182, 221, 267, 324, 392, 475, 576, 698, 845, 105, 127, 154, 187, 226, 274, 332, 402, 487, 590, 715, 866, 107, 130, 158, 191, 232, 280, 340, 412, 499, 604, 732, 887, 110, 133, 162, 196, 237, 287, 348, 422, 511, 619, 750, 909, 113, 137, 165, 200, 243, 294, 357, 432, 523, 634, 768, 931, 115, 140, 169, 205, 249, 301, 365, 442, 536, 649, 787, 953, 118, 143, 174, 210, 255, 309, 374, 453, 549, 665, 806, 976]
+
 E192 = [100, 121, 147, 178, 215, 261, 316, 383, 464, 562, 681, 825, 101, 123, 149, 180, 218, 264, 320, 388, 470, 569, 690, 835, 102, 124, 150, 182, 221, 267, 324, 392, 475, 576, 698, 845, 104, 126, 152, 184, 223, 271, 328, 397, 481, 583, 706, 856, 105, 127, 154, 187, 226, 274, 332, 402, 487, 590, 715, 866, 106, 129, 156, 189, 229, 277, 336, 407, 493, 597, 723, 876, 107, 130, 158, 191, 232, 280, 340, 412, 499, 604, 732, 887, 109, 132, 160, 193, 234, 284, 344, 417, 505, 612, 741, 898, 110, 133, 162, 196, 237, 287, 348, 422, 511, 619, 750, 909, 111, 135, 164, 198, 240, 291, 352, 427, 517, 626, 759, 920, 113, 137, 165, 200, 243, 294, 357, 432, 523, 634, 768, 931, 114, 138, 167, 203, 246, 298, 361, 437, 530, 642, 777, 942, 115, 140, 169, 205, 249, 301, 365, 442, 536, 649, 787, 953, 117, 142, 172, 208, 252, 305, 370, 448, 542, 657, 796, 965, 118, 143, 174, 210, 255, 309, 374, 453, 549, 665, 806, 976, 120, 145, 176, 213, 258, 312, 379, 459, 556, 673, 816, 988]

common/lib/capa/capa/templates/chemicalequationinput.html

+<section id="chemicalequationinput_${id}" class="chemicalequationinput">
+    <div class="script_placeholder" data-src="${previewer}"/>
+
+    % if status == 'unsubmitted':
+    <div class="unanswered" id="status_${id}">
+    % elif status == 'correct':
+    <div class="correct" id="status_${id}">
+    % elif status == 'incorrect':
+    <div class="incorrect" id="status_${id}">
+    % elif status == 'incomplete':
+    <div class="incorrect" id="status_${id}">
+    % endif
+
+  <input type="text" name="input_${id}" id="input_${id}" value="${value|h}"
+   % if size:
+   size="${size}"
+   % endif
+   />
+
+      <p class="status">
+        % if status == 'unsubmitted':
+        unanswered
+        % elif status == 'correct':
+        correct
+        % elif status == 'incorrect':
+        incorrect
+        % elif status == 'incomplete':
+        incomplete
+        % endif
+      </p>
+
+      <div id="input_${id}_preview" class="equation">
+      </div>
+      
+  <p id="answer_${id}" class="answer"></p>
+
+% if status in ['unsubmitted', 'correct', 'incorrect', 'incomplete']:
+</div>
+% endif
+</section>

common/lib/capa/capa/templates/crystallography.html

+<% doinline = "inline" if inline else "" %>
+
+<section id="textinput_${id}" class="textinput ${doinline}" >
+     <div id="holder" style="width:${width};height:${height}"></div>
+    <div class="script_placeholder" data-src="/static/js/raphael.js"></div><div class="script_placeholder" data-src="/static/js/sylvester.js"></div><div class="script_placeholder" data-src="/static/js/underscore-min.js"></div>
+    <div class="script_placeholder" data-src="/static/js/crystallography.js"></div>
+
+
+    % if state == 'unsubmitted':
+    <div class="unanswered ${doinline}" id="status_${id}">
+    % elif state == 'correct':
+    <div class="correct ${doinline}" id="status_${id}">
+    % elif state == 'incorrect':
+    <div class="incorrect ${doinline}" id="status_${id}">
+    % elif state == 'incomplete':
+    <div class="incorrect ${doinline}" id="status_${id}">
+    % endif
+    % if hidden:
+      <div style="display:none;" name="${hidden}" inputid="input_${id}" />
+    % endif
+
+  <input type="text" name="input_${id}" id="input_${id}" value="${value}"
+   % if size:
+   size="${size}"
+   % endif
+   % if hidden:
+    style="display:none;"
+   % endif
+   />
+
+      <p class="status">
+        % if state == 'unsubmitted':
+        unanswered
+        % elif state == 'correct':
+        correct
+        % elif state == 'incorrect':
+        incorrect
+        % elif state == 'incomplete':
+        incomplete
+        % endif
+      </p>
+
+  <p id="answer_${id}" class="answer"></p>
+
+  % if msg:
+      <span class="message">${msg|n}</span>
+  % endif
+% if state in ['unsubmitted', 'correct', 'incorrect', 'incomplete'] or hidden:
+</div>
+% endif
+</section>

common/lib/capa/capa/templates/textbox.html

@@ -5,8 +5,6 @@
        % endif
   >${value|h}</textarea>
 
-  <span id="answer_${id}"></span>
-
   <div class="grader-status">
     % if state == 'unsubmitted':
       <span class="unanswered" style="display:inline-block;" id="status_${id}">Unanswered</span>
@@ -26,6 +24,8 @@
     <p class="debug">${state}</p>
   </div>
 
+  <span id="answer_${id}"></span>
+
   <div class="external-grader-message">
     ${msg|n}
   </div>
@@ -42,7 +42,12 @@
         lineWrapping: true,
         indentUnit: "${tabsize}",
         tabSize: "${tabsize}",
-        indentWithTabs: true,
+        indentWithTabs: false,
+        extraKeys: {
+            "Tab": function(cm) {
+                cm.replaceSelection("${' '*tabsize}", "end");
+            }
+        },
         smartIndent: false
       });
     });

common/lib/capa/capa/tests/__init__.py

+import fs
+import fs.osfs
+import os
+
+from mock import Mock
+
+TEST_DIR = os.path.dirname(os.path.realpath(__file__))
+
+test_system = Mock(
+    ajax_url='courses/course_id/modx/a_location',
+    track_function=Mock(),
+    get_module=Mock(),
+    render_template=Mock(),
+    replace_urls=Mock(),
+    user=Mock(),
+    filestore=fs.osfs.OSFS(os.path.join(TEST_DIR, "test_files")),
+    debug=True,
+    xqueue={'interface':None, 'callback_url':'/', 'default_queuename': 'testqueue', 'waittime': 10},
+    node_path=os.environ.get("NODE_PATH", "/usr/local/lib/node_modules"),
+    anonymous_student_id = 'student'
+)

common/lib/capa/capa/tests/test_inputtypes.py

+"""
+Tests of input types (and actually responsetypes too)
+"""
+
+from datetime import datetime
+import json
+from mock import Mock
+from nose.plugins.skip import SkipTest
+import os
+import unittest
+
+from . import test_system
+from capa import inputtypes
+
+from lxml import etree
+
+def tst_render_template(template, context):
+    """
+    A test version of render to template.  Renders to the repr of the context, completely ignoring the template name.
+    """
+    return repr(context)
+
+
+system = Mock(render_template=tst_render_template)
+
+class OptionInputTest(unittest.TestCase):
+    '''
+    Make sure option inputs work
+    '''
+    def test_rendering_new(self):
+        xml = """<optioninput options="('Up','Down')" id="sky_input" correct="Up"/>"""
+        element = etree.fromstring(xml)
+
+        value = 'Down'
+        status = 'answered'
+        context = inputtypes._optioninput(element, value, status, test_system.render_template)
+        print 'context: ', context
+
+        expected = {'value': 'Down',
+                    'options': [('Up', 'Up'), ('Down', 'Down')],
+                    'state': 'answered',
+                    'msg': '',
+                    'inline': '',
+                    'id': 'sky_input'}
+
+        self.assertEqual(context, expected)
+
+
+    def test_rendering(self):
+        xml_str = """<optioninput options="('Up','Down')" id="sky_input" correct="Up"/>"""
+        element = etree.fromstring(xml_str)
+
+        state = {'value': 'Down',
+                 'id': 'sky_input',
+                 'status': 'answered'}
+        option_input = inputtypes.OptionInput(system, element, state)
+
+        context = option_input._get_render_context()
+
+        expected = {'value': 'Down',
+                    'options': [('Up', 'Up'), ('Down', 'Down')],
+                    'state': 'answered',
+                    'msg': '',
+                    'inline': '',
+                    'id': 'sky_input'}
+
+        self.assertEqual(context, expected)
+

common/lib/capa/capa/util.py

@@ -11,7 +11,7 @@ def compare_with_tolerance(v1, v2, tol):
 
      - v1    :  student result (number)
      - v2    :  instructor result (number)
-     - tol   :  tolerance (string or number)
+     - tol   :  tolerance (string representing a number)
 
     '''
     relative = tol.endswith('%')
@@ -26,9 +26,20 @@ def compare_with_tolerance(v1, v2, tol):
 def contextualize_text(text, context):  # private
     ''' Takes a string with variables. E.g. $a+$b.
     Does a substitution of those variables from the context '''
-    if not text: return text
+    if not text:
+        return text
     for key in sorted(context, lambda x, y: cmp(len(y), len(x))):
-        text = text.replace('$' + key, str(context[key]))
+        # TODO (vshnayder): This whole replacement thing is a big hack
+        # right now--context contains not just the vars defined in the
+        # program, but also e.g. a reference to the numpy module.
+        # Should be a separate dict of variables that should be
+        # replaced.
+        if '$' + key in text:
+            try:
+                s = str(context[key])
+            except UnicodeEncodeError:
+                s = context[key].encode('utf8', errors='ignore')
+            text = text.replace('$' + key, s)
     return text
 
 
@@ -53,8 +64,4 @@ def is_file(file_to_test):
     '''
     Duck typing to check if 'file_to_test' is a File object
     '''
-    is_file = True
-    for method in ['read', 'name']:
-        if not hasattr(file_to_test, method):
-            is_file = False
-    return is_file 
+    return all(hasattr(file_to_test, method) for method in ['read', 'name'])

common/lib/capa/capa/xqueue_interface.py

@@ -12,7 +12,7 @@ dateformat = '%Y%m%d%H%M%S'
 
 def make_hashkey(seed):
     '''
-    Generate a string key by hashing 
+    Generate a string key by hashing
     '''
     h = hashlib.md5()
     h.update(str(seed))
@@ -20,27 +20,27 @@ def make_hashkey(seed):
 
 
 def make_xheader(lms_callback_url, lms_key, queue_name):
-    '''
+    """
     Generate header for delivery and reply of queue request.
 
     Xqueue header is a JSON-serialized dict:
         { 'lms_callback_url': url to which xqueue will return the request (string),
-          'lms_key': secret key used by LMS to protect its state (string), 
+          'lms_key': secret key used by LMS to protect its state (string),
           'queue_name': designate a specific queue within xqueue server, e.g. 'MITx-6.00x' (string)
         }
-    '''
+    """
     return json.dumps({ 'lms_callback_url': lms_callback_url,
                         'lms_key': lms_key,
                         'queue_name': queue_name })
 
 
 def parse_xreply(xreply):
-    '''
+    """
     Parse the reply from xqueue. Messages are JSON-serialized dict:
         { 'return_code': 0 (success), 1 (fail)
           'content': Message from xqueue (string)
         }
-    '''
+    """
     try:
         xreply = json.loads(xreply)
     except ValueError, err:
@@ -61,11 +61,11 @@ class XQueueInterface(object):
         self.url  = url
         self.auth = django_auth
         self.session = requests.session(auth=requests_auth)
-        
+
     def send_to_queue(self, header, body, files_to_upload=None):
-        '''
+        """
         Submit a request to xqueue.
-        
+
         header: JSON-serialized dict in the format described in 'xqueue_interface.make_xheader'
 
         body: Serialized data for the receipient behind the queueing service. The operation of
@@ -74,14 +74,16 @@ class XQueueInterface(object):
         files_to_upload: List of file objects to be uploaded to xqueue along with queue request
 
         Returns (error_code, msg) where error_code != 0 indicates an error
-        '''
+        """
         # Attempt to send to queue
         (error, msg) = self._send_to_queue(header, body, files_to_upload)
 
-        if error and (msg == 'login_required'): # Log in, then try again
+        # Log in, then try again
+        if error and (msg == 'login_required'):
             self._login()
             if files_to_upload is not None:
-                for f in files_to_upload: # Need to rewind file pointers
+                # Need to rewind file pointers
+                for f in files_to_upload:
                     f.seek(0)
             (error, msg) = self._send_to_queue(header, body, files_to_upload)
 
@@ -91,18 +93,18 @@ class XQueueInterface(object):
     def _login(self):
         payload = { 'username': self.auth['username'],
                     'password': self.auth['password'] }
-        return self._http_post(self.url+'/xqueue/login/', payload)
+        return self._http_post(self.url + '/xqueue/login/', payload)
 
 
     def _send_to_queue(self, header, body, files_to_upload):
         payload = {'xqueue_header': header,
                    'xqueue_body'  : body}
-        files = {} 
+        files = {}
         if files_to_upload is not None:
             for f in files_to_upload:
                 files.update({ f.name: f })
 
-        return self._http_post(self.url+'/xqueue/submit/', payload, files=files)
+        return self._http_post(self.url + '/xqueue/submit/', payload, files=files)
 
 
     def _http_post(self, url, data, files=None):
@@ -111,7 +113,7 @@ class XQueueInterface(object):
         except requests.exceptions.ConnectionError, err:
             log.error(err)
             return (1, 'cannot connect to server')
-        
+
         if r.status_code not in [200]:
             return (1, 'unexpected HTTP status code [%d]' % r.status_code)
 

common/lib/xmodule/xmodule/capa_module.py

@@ -76,9 +76,13 @@ class CapaModule(XModule):
     '''
     icon_class = 'problem'
 
-    js = {'coffee': [resource_string(__name__, 'js/src/capa/display.coffee')],
+    js = {'coffee': [resource_string(__name__, 'js/src/capa/display.coffee'),
+                     resource_string(__name__, 'js/src/collapsible.coffee'),
+                     resource_string(__name__, 'js/src/javascript_loader.coffee'),
+                    ],
           'js': [resource_string(__name__, 'js/src/capa/imageinput.js'),
                  resource_string(__name__, 'js/src/capa/schematic.js')]}
+
     js_module_name = "Problem"
     css = {'scss': [resource_string(__name__, 'css/capa/display.scss')]}
 
@@ -129,6 +133,11 @@ class CapaModule(XModule):
         if self.rerandomize == 'never':
             self.seed = 1
         elif self.rerandomize == "per_student" and hasattr(self.system, 'id'):
+            # TODO: This line is badly broken:
+            # (1) We're passing student ID to xmodule.
+            # (2) There aren't bins of students.  -- we only want 10 or 20 randomizations, and want to assign students
+            # to these bins, and may not want cohorts.  So e.g. hash(your-id, problem_id) % num_bins.
+            #     - analytics really needs small number of bins.
             self.seed = system.id
         else:
             self.seed = None

common/lib/xmodule/xmodule/css/capa/display.scss

@@ -44,8 +44,8 @@ section.problem {
       }
     }
 
-    min-width:100px; 
-    width: auto !important; 
+    min-width:100px;
+    width: auto !important;
     width: 100px;
 
     .indicator_container {
@@ -299,7 +299,7 @@ section.problem {
   form.option-input {
     margin: -10px 0 20px;
     padding-bottom: 20px;
-    
+
     select {
       margin-right: flex-gutter();
     }
@@ -421,7 +421,7 @@ section.problem {
         background-position: right;
         background-repeat: no-repeat;
     }
-    
+
     pre {
       @include border-radius(0);
       border-radius: 0;
@@ -572,7 +572,7 @@ section.problem {
         }
       }
 
-      section {
+      > section {
         padding: 9px;
       }
     }
@@ -622,4 +622,70 @@ section.problem {
       }
     }
   }
+
+  .external-grader-message {
+    section {
+      padding-left: 20px;
+      background-color: #FAFAFA;
+      color: #2C2C2C;
+      font-family: monospace;
+      font-size: 1em;
+
+      .shortform {
+        font-weight: bold;
+      }
+
+      .longform {
+        padding: 0px;
+        margin: 0px;
+
+        .result-errors {
+          margin: 5px;
+          padding: 10px 10px 10px 40px;
+          background: url('../images/incorrect-icon.png') center left no-repeat;
+          li {
+            color: #B00;
+            }
+        }
+
+        .result-output {
+          margin: 5px;
+          padding: 20px 0px 15px 50px;
+          border-top: 1px solid #DDD;
+          border-left: 20px solid #FAFAFA;
+
+          h4 {
+            font-family: monospace;
+            font-size: 1em;
+          }
+
+          dl {
+            margin: 0px;
+          }
+
+          dt {
+            margin-top: 20px;
+          }
+
+          dd {
+            margin-left: 24pt;
+          }
+        }
+
+        .result-correct {
+          background: url('../images/correct-icon.png') left 20px no-repeat;
+          .result-actual-output {
+            color: #090;
+          }
+        }
+
+        .result-incorrect {
+          background: url('../images/incorrect-icon.png') left 20px no-repeat;
+          .result-actual-output {
+            color: #B00;
+          }
+        }
+      }
+    }
+  }
 }

common/lib/xmodule/xmodule/graders.py

 import abc
+import inspect
 import json
 import logging
 import random
@@ -109,6 +110,15 @@ def aggregate_scores(scores, section_name="summary"):
     return all_total, graded_total
 
 
+def invalid_args(func, argdict):
+    """
+    Given a function and a dictionary of arguments, returns a set of arguments
+    from argdict that aren't accepted by func
+    """
+    args, varargs, keywords, defaults = inspect.getargspec(func)
+    if keywords: return set()  # All accepted
+    return set(argdict) - set(args)
+
 def grader_from_conf(conf):
     """
     This creates a CourseGrader from a configuration (such as in course_settings.py).
@@ -128,14 +138,21 @@ def grader_from_conf(conf):
         try:
             if 'min_count' in subgraderconf:
                 #This is an AssignmentFormatGrader
-                subgrader = AssignmentFormatGrader(**subgraderconf)
-                subgraders.append((subgrader, subgrader.category, weight))
+                subgrader_class = AssignmentFormatGrader
             elif 'name' in subgraderconf:
                 #This is an SingleSectionGrader
-                subgrader = SingleSectionGrader(**subgraderconf)
-                subgraders.append((subgrader, subgrader.category, weight))
+                subgrader_class = SingleSectionGrader
             else:
                 raise ValueError("Configuration has no appropriate grader class.")
+            
+            bad_args = invalid_args(subgrader_class.__init__, subgraderconf)
+            if len(bad_args) > 0:
+                log.warning("Invalid arguments for a subgrader: %s", bad_args)
+                for key in bad_args:
+                    del subgraderconf[key]
+            
+            subgrader = subgrader_class(**subgraderconf)
+            subgraders.append((subgrader, subgrader.category, weight))
 
         except (TypeError, ValueError) as error:
             # Add info and re-raise
@@ -300,9 +317,12 @@ class AssignmentFormatGrader(CourseGrader):
 
     short_label is similar to section_type, but shorter. For example, for Homework it would be
     "HW".
+    
+    starting_index is the first number that will appear. For example, starting_index=3 and
+    min_count = 2 would produce the labels "Assignment 3", "Assignment 4"
 
     """
-    def __init__(self, type, min_count, drop_count, category=None, section_type=None, short_label=None, show_only_average=False):
+    def __init__(self, type, min_count, drop_count, category=None, section_type=None, short_label=None, show_only_average=False, starting_index=1):
         self.type = type
         self.min_count = min_count
         self.drop_count = drop_count
@@ -310,6 +330,7 @@ class AssignmentFormatGrader(CourseGrader):
         self.section_type = section_type or self.type
         self.short_label = short_label or self.type
         self.show_only_average = show_only_average
+        self.starting_index = starting_index
 
     def grade(self, grade_sheet, generate_random_scores=False):
         def totalWithDrops(breakdown, drop_count):
@@ -345,7 +366,7 @@ class AssignmentFormatGrader(CourseGrader):
                     section_name = scores[i].section
                 
                 percentage = earned / float(possible)
-                summary = "{section_type} {index} - {name} - {percent:.0%} ({earned:.3n}/{possible:.3n})".format(index=i + 1,
+                summary = "{section_type} {index} - {name} - {percent:.0%} ({earned:.3n}/{possible:.3n})".format(index=i + self.starting_index,
                                                                 section_type=self.section_type,
                                                                 name=section_name,
                                                                 percent=percentage,
@@ -353,9 +374,9 @@ class AssignmentFormatGrader(CourseGrader):
                                                                 possible=float(possible))
             else:
                 percentage = 0
-                summary = "{section_type} {index} Unreleased - 0% (?/?)".format(index=i + 1, section_type=self.section_type)
+                summary = "{section_type} {index} Unreleased - 0% (?/?)".format(index=i + self.starting_index, section_type=self.section_type)
 
-            short_label = "{short_label} {index:02d}".format(index=i + 1, short_label=self.short_label)
+            short_label = "{short_label} {index:02d}".format(index=i + self.starting_index, short_label=self.short_label)
             
             breakdown.append({'percent': percentage, 'label': short_label, 'detail': summary, 'category': self.category})
 

common/lib/xmodule/xmodule/html_module.py

@@ -21,7 +21,11 @@ log = logging.getLogger("mitx.courseware")
 
 
 class HtmlModule(XModule):
-    js = {'coffee': [resource_string(__name__, 'js/src/html/display.coffee')]}
+    js = {'coffee': [resource_string(__name__, 'js/src/javascript_loader.coffee'),
+                     resource_string(__name__, 'js/src/collapsible.coffee'),
+                     resource_string(__name__, 'js/src/html/display.coffee')
+                    ]
+         }
     js_module_name = "HTMLModule"
     
     def get_html(self):

common/lib/xmodule/xmodule/js/src/capa/display.coffee

@@ -27,11 +27,7 @@ class @Problem
     @$('section.action input.save').click @save
 
     # Collapsibles
-    @$('.longform').hide();
-    @$('.shortform').append('<a href="#" class="full">See full output</a>');
-    @$('.collapsible section').hide();
-    @$('.full').click @toggleFull
-    @$('.collapsible header a').click @toggleHint
+    Collapsible.setCollapsibles(@el)
 
     # Dynamath
     @$('input.math').keyup(@refreshMath)
@@ -67,7 +63,7 @@ class @Problem
       @new_queued_items = $(response.html).find(".xqueue")
       if @new_queued_items.length isnt @num_queued_items
         @el.html(response.html)
-        @executeProblemScripts () =>
+        JavascriptLoader.executeModuleScripts @el, () =>
           @setupInputTypes()
           @bind()
       
@@ -81,18 +77,19 @@ class @Problem
   render: (content) ->
     if content
       @el.html(content)
-      @executeProblemScripts () =>
+      JavascriptLoader.executeModuleScripts @el, () =>
         @setupInputTypes()
         @bind()
         @queueing()
     else
       $.postWithPrefix "#{@url}/problem_get", (response) =>
         @el.html(response.html)
-        @executeProblemScripts () =>
+        JavascriptLoader.executeModuleScripts @el, () =>
           @setupInputTypes()
           @bind()
           @queueing()
 
+
   # TODO add hooks for problem types here by inspecting response.html and doing
   # stuff if a div w a class is found
 
@@ -106,50 +103,6 @@ class @Problem
         if setupMethod?
           @inputtypeDisplays[id] = setupMethod(inputtype)
 
-  executeProblemScripts: (callback=null) ->
-
-    placeholders = @el.find(".script_placeholder")
-
-    if placeholders.length == 0
-      callback()
-      return
-
-    completed      = (false for i in [1..placeholders.length])
-    callbackCalled = false
-
-    # This is required for IE8 support.
-    completionHandlerGeneratorIE = (index) =>
-      return () ->
-        if (this.readyState == 'complete' || this.readyState == 'loaded')
-          #completionHandlerGenerator.call(self, index)()
-          completionHandlerGenerator(index)()
-
-    completionHandlerGenerator = (index) =>
-      return () =>
-        allComplete = true
-        completed[index] = true
-        for flag in completed
-          if not flag
-            allComplete = false
-            break
-        if allComplete and not callbackCalled
-          callbackCalled = true
-          callback() if callback?
-
-    placeholders.each (index, placeholder) ->
-      s = document.createElement('script')
-      s.setAttribute('src', $(placeholder).attr("data-src"))
-      s.setAttribute('type', "text/javascript")
-
-      s.onload             = completionHandlerGenerator(index)
-
-      # s.onload does not fire in IE8; this does.
-      s.onreadystatechange = completionHandlerGeneratorIE(index)
-
-      # Need to use the DOM elements directly or the scripts won't execute
-      # properly.
-      $('head')[0].appendChild(s)
-      $(placeholder).remove()
 
   ###
   # 'check_fd' uses FormData to allow file submissions in the 'problem_check' dispatch,
@@ -340,17 +293,6 @@ class @Problem
       element.CodeMirror.save() if element.CodeMirror.save
     @answers = @inputs.serialize()
 
-  toggleFull: (event) =>
-    $(event.target).parent().siblings().slideToggle()
-    $(event.target).parent().parent().toggleClass('open')
-    text = $(event.target).text() == 'See full output' ? 'Hide output' : 'See full output'
-    $(this).text(text)
-
-  toggleHint: (event) =>
-    event.preventDefault()
-    $(event.target).parent().siblings().slideToggle()
-    $(event.target).parent().parent().toggleClass('open')
-
   inputtypeSetupMethods:
 
     'text-input-dynamath': (element) =>
@@ -392,10 +334,13 @@ class @Problem
   inputtypeShowAnswerMethods:
     choicegroup: (element, display, answers) =>
       element = $(element)
-      for key, value of answers
-        element.find('input').attr('disabled', 'disabled')
-        for choice in value
-          element.find("label[for='input_#{key}_#{choice}']").addClass 'choicegroup_correct'
+
+      element.find('input').attr('disabled', 'disabled')
+
+      input_id = element.attr('id').replace(/inputtype_/,'')
+      answer = answers[input_id]
+      for choice in answer
+        element.find("label[for='input_#{input_id}_#{choice}']").addClass 'choicegroup_correct'
 
     javascriptinput: (element, display, answers) =>
       answer_id = $(element).attr('id').split("_")[1...].join("_")

common/lib/xmodule/xmodule/js/src/collapsible.coffee

+class @Collapsible
+
+  # Set of library functions that provide a simple way to add collapsible
+  # functionality to elements. 
+
+  # setCollapsibles:
+  #   Scan element's content for generic collapsible containers
+  @setCollapsibles: (el) =>
+    ###
+    el: container
+    ###
+    el.find('.longform').hide()
+    el.find('.shortform').append('<a href="#" class="full">See full output</a>')
+    el.find('.collapsible header + section').hide()
+    el.find('.full').click @toggleFull
+    el.find('.collapsible header a').click @toggleHint
+
+  @toggleFull: (event) =>
+    event.preventDefault()
+    $(event.target).parent().siblings().slideToggle()
+    $(event.target).parent().parent().toggleClass('open')
+    if $(event.target).text() == 'See full output'
+      new_text = 'Hide output'
+    else
+      new_text = 'See full ouput'
+    $(event.target).text(new_text)
+
+  @toggleHint: (event) =>
+    event.preventDefault()
+    $(event.target).parent().siblings().slideToggle()
+    $(event.target).parent().parent().toggleClass('open')

common/lib/xmodule/xmodule/js/src/html/display.coffee

@@ -2,26 +2,9 @@ class @HTMLModule
 
   constructor: (@element) ->
     @el = $(@element)
-    @setCollapsibles()
+    JavascriptLoader.executeModuleScripts(@el)
+    Collapsible.setCollapsibles(@el)
     MathJax.Hub.Queue ["Typeset", MathJax.Hub, @el[0]]
 
   $: (selector) ->
     $(selector, @el)
-
-  setCollapsibles: =>
-    $('.longform').hide();
-    $('.shortform').append('<a href="#" class="full">See full output</a>');
-    $('.collapsible section').hide();
-    $('.full').click @toggleFull
-    $('.collapsible header a').click @toggleHint
-
-  toggleFull: (event) =>
-    $(event.target).parent().siblings().slideToggle()
-    $(event.target).parent().parent().toggleClass('open')
-    text = $(event.target).text() == 'See full output' ? 'Hide output' : 'See full output'
-    $(this).text(text)
-
-  toggleHint: (event) =>
-    event.preventDefault()
-    $(event.target).parent().siblings().slideToggle()
-    $(event.target).parent().parent().toggleClass('open')
\ No newline at end of file

common/lib/xmodule/xmodule/js/src/javascript_loader.coffee

+class @JavascriptLoader
+
+  # Set of library functions that provide common interface for javascript loading
+  # for all module types. All functionality provided by JavascriptLoader should take
+  # place at module scope, i.e. don't run jQuery over entire page
+
+  # executeModuleScripts:
+  #   Scan the module ('el') for "script_placeholder"s, then:
+  #     1) Fetch each script from server
+  #     2) Explicitly attach the script to the <head> of document
+  #     3) Explicitly wait for each script to be loaded
+  #     4) Return to callback function when all scripts loaded
+  @executeModuleScripts: (el, callback=null) ->
+
+    placeholders = el.find(".script_placeholder")
+
+    if placeholders.length == 0
+      callback() if callback?
+      return
+
+    # TODO: Verify the execution order of multiple placeholders
+    completed      = (false for i in [1..placeholders.length])
+    callbackCalled = false
+
+    # This is required for IE8 support.
+    completionHandlerGeneratorIE = (index) =>
+      return () ->
+        if (this.readyState == 'complete' || this.readyState == 'loaded')
+          #completionHandlerGenerator.call(self, index)()
+          completionHandlerGenerator(index)()
+
+    completionHandlerGenerator = (index) =>
+      return () =>
+        allComplete = true
+        completed[index] = true
+        for flag in completed
+          if not flag
+            allComplete = false
+            break
+        if allComplete and not callbackCalled
+          callbackCalled = true
+          callback() if callback?
+
+    # Keep a map of what sources we're loaded from, and don't do it twice.
+    loaded = {}
+    placeholders.each (index, placeholder) ->
+      # TODO: Check if the script already exists in DOM. If so, (1) copy it
+      #         into memory; (2) delete the DOM script element; (3) reappend it.
+      #       This would prevent memory bloat and save a network request.
+      src = $(placeholder).attr("data-src")
+      if src not of loaded
+        loaded[src] = true
+        s = document.createElement('script')
+        s.setAttribute('src', src)
+        s.setAttribute('type', "text/javascript")
+  
+        s.onload             = completionHandlerGenerator(index)
+
+        # s.onload does not fire in IE8; this does.
+        s.onreadystatechange = completionHandlerGeneratorIE(index)
+
+        # Need to use the DOM elements directly or the scripts won't execute
+        # properly.
+        $('head')[0].appendChild(s)
+      else
+        # just call the completion callback directly, without reloading the file
+        completionHandlerGenerator(index)()
+      $(placeholder).remove()
+        
+      

common/lib/xmodule/xmodule/modulestore/xml_importer.py

@@ -29,7 +29,9 @@ def import_static_content(modules, data_dir, static_content_store):
 
    
     # now import all static assets
-    static_dir = '{0}/{1}/static/'.format(data_dir, course_data_dir)
+    static_dir = '{0}/static/'.format(course_data_dir)
+
+    logging.debug("Importing static assets in {0}".format(static_dir))
 
     for dirname, dirnames, filenames in os.walk(static_dir):
         for filename in filenames:

common/lib/xmodule/xmodule/tests/test_progress.py

+"""Module progress tests"""
+
+import unittest
+
+from xmodule.progress import Progress
+from xmodule import x_module
+
+from . import i4xs
+
+class ProgressTest(unittest.TestCase):
+    ''' Test that basic Progress objects work.  A Progress represents a
+    fraction between 0 and 1.
+    '''
+    not_started = Progress(0, 17)
+    part_done = Progress(2, 6)
+    half_done = Progress(3, 6)
+    also_half_done = Progress(1, 2)
+    done = Progress(7, 7)
+
+    def test_create_object(self):
+        # These should work:
+        p = Progress(0, 2)
+        p = Progress(1, 2)
+        p = Progress(2, 2)
+
+        p = Progress(2.5, 5.0)
+        p = Progress(3.7, 12.3333)
+
+        # These shouldn't
+        self.assertRaises(ValueError, Progress, 0, 0)
+        self.assertRaises(ValueError, Progress, 2, 0)
+        self.assertRaises(ValueError, Progress, 1, -2)
+
+        self.assertRaises(TypeError, Progress, 0, "all")
+        # check complex numbers just for the heck of it :)
+        self.assertRaises(TypeError, Progress, 2j, 3)
+
+    def test_clamp(self):
+        self.assertEqual((2, 2), Progress(3, 2).frac())
+        self.assertEqual((0, 2), Progress(-2, 2).frac())
+
+    def test_frac(self):
+        p = Progress(1, 2)
+        (a, b) = p.frac()
+        self.assertEqual(a, 1)
+        self.assertEqual(b, 2)
+
+    def test_percent(self):
+        self.assertEqual(self.not_started.percent(), 0)
+        self.assertAlmostEqual(self.part_done.percent(), 33.33333333333333)
+        self.assertEqual(self.half_done.percent(), 50)
+        self.assertEqual(self.done.percent(), 100)
+
+        self.assertEqual(self.half_done.percent(), self.also_half_done.percent())
+
+    def test_started(self):
+        self.assertFalse(self.not_started.started())
+
+        self.assertTrue(self.part_done.started())
+        self.assertTrue(self.half_done.started())
+        self.assertTrue(self.done.started())
+
+    def test_inprogress(self):
+        # only true if working on it
+        self.assertFalse(self.done.inprogress())
+        self.assertFalse(self.not_started.inprogress())
+
+        self.assertTrue(self.part_done.inprogress())
+        self.assertTrue(self.half_done.inprogress())
+
+    def test_done(self):
+        self.assertTrue(self.done.done())
+        self.assertFalse(self.half_done.done())
+        self.assertFalse(self.not_started.done())
+
+    def test_str(self):
+        self.assertEqual(str(self.not_started), "0/17")
+        self.assertEqual(str(self.part_done), "2/6")
+        self.assertEqual(str(self.done), "7/7")
+
+    def test_ternary_str(self):
+        self.assertEqual(self.not_started.ternary_str(), "none")
+        self.assertEqual(self.half_done.ternary_str(), "in_progress")
+        self.assertEqual(self.done.ternary_str(), "done")
+
+    def test_to_js_status(self):
+        '''Test the Progress.to_js_status_str() method'''
+
+        self.assertEqual(Progress.to_js_status_str(self.not_started), "none")
+        self.assertEqual(Progress.to_js_status_str(self.half_done), "in_progress")
+        self.assertEqual(Progress.to_js_status_str(self.done), "done")
+        self.assertEqual(Progress.to_js_status_str(None), "NA")
+
+    def test_to_js_detail_str(self):
+        '''Test the Progress.to_js_detail_str() method'''
+        f = Progress.to_js_detail_str
+        for p in (self.not_started, self.half_done, self.done):
+            self.assertEqual(f(p), str(p))
+        # But None should be encoded as NA
+        self.assertEqual(f(None), "NA")
+
+    def test_add(self):
+        '''Test the Progress.add_counts() method'''
+        p = Progress(0, 2)
+        p2 = Progress(1, 3)
+        p3 = Progress(2, 5)
+        pNone = None
+        add = lambda a, b: Progress.add_counts(a, b).frac()
+
+        self.assertEqual(add(p, p), (0, 4))
+        self.assertEqual(add(p, p2), (1, 5))
+        self.assertEqual(add(p2, p3), (3, 8))
+
+        self.assertEqual(add(p2, pNone), p2.frac())
+        self.assertEqual(add(pNone, p2), p2.frac())
+
+    def test_equality(self):
+        '''Test that comparing Progress objects for equality
+        works correctly.'''
+        p = Progress(1, 2)
+        p2 = Progress(2, 4)
+        p3 = Progress(1, 2)
+        self.assertTrue(p == p3)
+        self.assertFalse(p == p2)
+
+        # Check != while we're at it
+        self.assertTrue(p != p2)
+        self.assertFalse(p != p3)
+
+
+class ModuleProgressTest(unittest.TestCase):
+    ''' Test that get_progress() does the right thing for the different modules
+    '''
+    def test_xmodule_default(self):
+        '''Make sure default get_progress exists, returns None'''
+        xm = x_module.XModule(i4xs, 'a://b/c/d/e', None, {})
+        p = xm.get_progress()
+        self.assertEqual(p, None)

common/lib/xmodule/xmodule/video_module.py

@@ -31,12 +31,23 @@ class VideoModule(XModule):
         self.youtube = xmltree.get('youtube')
         self.position = 0
         self.show_captions = xmltree.get('show_captions', 'true')
+        self.source = self._get_source(xmltree)
 
         if instance_state is not None:
             state = json.loads(instance_state)
             if 'position' in state:
                 self.position = int(float(state['position']))
 
+    def _get_source(self, xmltree):
+        # find the first valid source
+        source = None
+        for element in xmltree.findall('source'):
+            src = element.get('src')
+            if src:
+                source = src
+                break
+        return source
+
     def handle_ajax(self, dispatch, get):
         '''
         Handle ajax calls to this video.
@@ -73,6 +84,7 @@ class VideoModule(XModule):
             'streams': self.video_list(),
             'id': self.location.html_id(),
             'position': self.position,
+            'source': self.source,
             'display_name': self.display_name,
             # TODO (cpennington): This won't work when we move to data that isn't on the filesystem
             'data_dir': self.metadata['data_dir'],
@@ -82,6 +94,5 @@ class VideoModule(XModule):
 
 class VideoDescriptor(RawDescriptor):
     module_class = VideoModule
-    
     stores_state = True
     template_dir_name = "video"

common/static/coffee/src/discussion/utils.coffee

@@ -25,6 +25,10 @@ class @DiscussionUtil
     staff = _.union(@roleIds['Staff'], @roleIds['Moderator'], @roleIds['Administrator'])
     _.include(staff, parseInt(user_id))
 
+  @isTA: (user_id) ->
+    ta = _.union(@roleIds['Community TA'])
+    _.include(ta, parseInt(user_id))
+
   @bulkUpdateContentInfo: (infos) ->
     for id, info of infos
       Content.getContent(id).updateInfo(info)
@@ -157,7 +161,7 @@ class @DiscussionUtil
   @makeWmdEditor: ($content, $local, cls_identifier) ->
     elem = $local(".#{cls_identifier}")
     placeholder = elem.data('placeholder')
-    id = elem.data("id")
+    id = elem.attr("data-id") # use attr instead of data because we want to avoid type coercion
     appended_id = "-#{cls_identifier}-#{id}"
     imageUploadUrl = @urlFor('upload')
     _processor = (_this) ->
@@ -170,12 +174,12 @@ class @DiscussionUtil
 
   @getWmdEditor: ($content, $local, cls_identifier) ->
     elem = $local(".#{cls_identifier}")
-    id = elem.data("id")
+    id = elem.attr("data-id") # use attr instead of data because we want to avoid type coercion
     @wmdEditors["#{cls_identifier}-#{id}"]
 
   @getWmdInput: ($content, $local, cls_identifier) ->
     elem = $local(".#{cls_identifier}")
-    id = elem.data("id")
+    id = elem.attr("data-id") # use attr instead of data because we want to avoid type coercion
     $local("#wmd-input-#{cls_identifier}-#{id}")
 
   @getWmdContent: ($content, $local, cls_identifier) ->

common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee

@@ -156,7 +156,11 @@ if Backbone?
       @$(".post-list").append(view.el)
 
     threadSelected: (e) =>
-      thread_id = $(e.target).closest("a").data("id")
+      # Use .attr('data-id') rather than .data('id') because .data does type
+      # coercion. Usually, this is fine, but when Mongo gives an object id with
+      # no letters, it casts it to a Number.
+
+      thread_id = $(e.target).closest("a").attr("data-id")
       @setActiveThread(thread_id)
       @trigger("thread:selected", thread_id)  # This triggers a callback in the DiscussionRouter which calls the line above...
       false

common/static/coffee/src/discussion/views/response_comment_show_view.coffee

@@ -32,3 +32,5 @@ if Backbone?
     markAsStaff: ->
       if DiscussionUtil.isStaff(@model.get("user_id"))
         @$el.find("a.profile-link").after('<span class="staff-label">staff</span>')
+      else if DiscussionUtil.isTA(@model.get("user_id"))
+        @$el.find("a.profile-link").after('<span class="community-ta-label">Community&nbsp;&nbsp;TA</span>')

common/static/coffee/src/discussion/views/thread_response_show_view.coffee

@@ -37,6 +37,9 @@ if Backbone?
       if DiscussionUtil.isStaff(@model.get("user_id"))
         @$el.addClass("staff")
         @$el.prepend('<div class="staff-banner">staff</div>')
+      else if DiscussionUtil.isTA(@model.get("user_id"))
+        @$el.addClass("community-ta")
+        @$el.prepend('<div class="community-ta-banner">Community TA</div>')
 
     toggleVote: (event) ->
       event.preventDefault()

common/static/js/capa/README

+These files really should be in the capa module, but we don't have a way to load js from there at the moment.  (TODO)

common/static/js/capa/chemical_equation_preview.js

+(function () {
+    update = function() {
+        function create_handler(saved_div) {
+            return (function(response) {
+                if (response.error) {
+                    saved_div.html("<span class='error'>" + response.error + "</span>");
+                } else {
+                    saved_div.html(response.preview);
+                }
+            });
+        }
+
+        prev_id = "#" + this.id + "_preview";
+        preview_div = $(prev_id)
+
+        $.get("/preview/chemcalc/", {"formula" : this.value}, create_handler(preview_div));
+    }
+
+    inputs = $('.chemicalequationinput input');
+    // update on load
+    inputs.each(update); 
+    // and on every change
+    inputs.bind("input", update);
+}).call(this);

common/static/js/vendor/timepicker/jquery.timepicker.css

@@ -11,7 +11,7 @@
 	-moz-box-shadow: 0 5px 10px rgba(0,0,0,0.1);
 	box-shadow: 0 5px 10px rgba(0,0,0,0.1);
 	outline: none;
-	z-index: 10001;
+	z-index: 100001;
 	font-size: 12px;
 }
 

create-dev-env.sh

@@ -13,13 +13,13 @@ ouch() {
     printf '\E[31m'
 
     cat<<EOL
-    
+
     !! ERROR !!
 
-    The last command did not complete successfully, 
+    The last command did not complete successfully,
     For more details or trying running the
-    script again with the -v flag.  
-    
+    script again with the -v flag.
+
     Output of the script is recorded in $LOG
 
 EOL
@@ -27,18 +27,18 @@ EOL
 
 }
 error() {
-      printf '\E[31m'; echo "$@"; printf '\E[0m' 
+      printf '\E[31m'; echo "$@"; printf '\E[0m'
 }
 output() {
-      printf '\E[36m'; echo "$@"; printf '\E[0m' 
+      printf '\E[36m'; echo "$@"; printf '\E[0m'
 }
 usage() {
     cat<<EO
 
     Usage: $PROG [-c] [-v] [-h]
-    
+
             -c        compile scipy and numpy
-            -s        give access to global site-packages for virtualenv 
+            -s        give access to global site-packages for virtualenv
             -v        set -x + spew
             -h        this
 
@@ -49,7 +49,7 @@ EO
 info() {
 
     cat<<EO
-    MITx base dir : $BASE 
+    MITx base dir : $BASE
     Python dir : $PYTHON_DIR
     Ruby dir : $RUBY_DIR
     Ruby ver : $RUBY_VER
@@ -59,11 +59,11 @@ EO
 
 clone_repos() {
     cd "$BASE"
-    
+
     if [[ -d "$BASE/mitx/.git" ]]; then
         output "Pulling mitx"
         cd "$BASE/mitx"
-        git pull 
+        git pull
     else
         output "Cloning mitx"
         if [[ -d "$BASE/mitx" ]]; then
@@ -71,13 +71,13 @@ clone_repos() {
         fi
         git clone git@github.com:MITx/mitx.git
     fi
-     
+
     if [[ ! -d "$BASE/mitx/askbot/.git" ]]; then
         output "Cloning askbot as a submodule of mitx"
         cd "$BASE/mitx"
         git submodule update --init
     fi
-    
+
     # By default, dev environments start with a copy of 6.002x
     cd "$BASE"
     mkdir -p "$BASE/data"
@@ -85,14 +85,14 @@ clone_repos() {
     if [[ -d "$BASE/data/$REPO/.git" ]]; then
         output "Pulling $REPO"
         cd "$BASE/data/$REPO"
-        git pull 
+        git pull
     else
         output "Cloning $REPO"
         if [[ -d "$BASE/data/$REPO" ]]; then
             mv "$BASE/data/$REPO" "${BASE}/data/$REPO.bak.$$"
         fi
 	cd "$BASE/data"
-        git clone git@github.com:MITx/$REPO 
+        git clone git@github.com:MITx/$REPO
     fi
 }
 
@@ -118,8 +118,8 @@ if [[ $? != 0 ]]; then
     exit 1
 fi
 eval set -- "$ARGS"
-while true; do 
-    case $1 in 
+while true; do
+    case $1 in
         -c)
             compile=true
             shift
@@ -159,16 +159,16 @@ cat<<EO
   To compile scipy and numpy from source use the -c option
 
   !!! Do not run this script from an existing virtualenv !!!
-  
+
   If you are in a ruby/python virtualenv please start a new
-  shell. 
+  shell.
 
 EO
 info
 output "Press return to begin or control-C to abort"
 read dummy
 
-# log all stdout and stderr 
+# log all stdout and stderr
 exec > >(tee $LOG)
 exec 2>&1
 
@@ -193,7 +193,7 @@ case `uname -s` in
             maya|lisa|natty|oneiric|precise)
                 output "Installing ubuntu requirements"
                 sudo apt-get -y update
-                sudo apt-get -y install $APT_PKGS 
+                sudo apt-get -y install $APT_PKGS
                 clone_repos
                 ;;
             *)
@@ -203,11 +203,11 @@ case `uname -s` in
         esac
         ;;
     Darwin)
-    
+
         if [[ ! -w /usr/local ]]; then
             cat<<EO
-   
-        You need to be able to write to /usr/local for 
+
+        You need to be able to write to /usr/local for
         the installation of brew and brew packages.
 
         Either make sure the group you are in (most likely 'staff')
@@ -221,13 +221,13 @@ EO
 
         fi
 
-        command -v brew &>/dev/null || { 
+        command -v brew &>/dev/null || {
             output "Installing brew"
             /usr/bin/ruby <(curl -fsSkL raw.github.com/mxcl/homebrew/go)
-        } 
+        }
         command -v git &>/dev/null || {
             output "Installing git"
-            brew install git 
+            brew install git
         }
 
         clone_repos
@@ -241,17 +241,21 @@ EO
         for pkg in $(cat $BREW_FILE); do
             grep $pkg <(brew list) &>/dev/null || {
                 output "Installing $pkg"
-                brew install $pkg  
+                brew install $pkg
             }
         done
+
+        # paths where brew likes to install python scripts
+        PATH=/usr/local/share/python:/usr/local/bin:$PATH
+
         command -v pip &>/dev/null || {
             output "Installing pip"
-            sudo easy_install pip  
+            easy_install pip
         }
 
         if ! grep -Eq ^1.7 <(virtualenv --version 2>/dev/null); then
             output "Installing virtualenv >1.7"
-            sudo pip install 'virtualenv>1.7' virtualenvwrapper
+            pip install 'virtualenv>1.7' virtualenvwrapper
         fi
 
         command -v coffee &>/dev/null || {
@@ -267,18 +271,10 @@ EO
 esac
 
 output "Installing rvm and ruby"
-curl -sL get.rvm.io | bash -s stable
+curl -sL get.rvm.io | bash -s -- --version 1.15.7
 source $RUBY_DIR/scripts/rvm
-# skip the intro 
+# skip the intro
 LESS="-E" rvm install $RUBY_VER
-if [[ $systempkgs ]]; then
-    virtualenv --system-site-packages "$PYTHON_DIR"
-else
-    # default behavior for virtualenv>1.7 is 
-    # --no-site-packages
-    virtualenv  "$PYTHON_DIR"
-fi
-source $PYTHON_DIR/bin/activate
 output "Installing gem bundler"
 gem install bundler
 output "Installing ruby packages"
@@ -287,6 +283,16 @@ cd $BASE/mitx  || true
 bundle install
 
 cd $BASE
+if [[ $systempkgs ]]; then
+    virtualenv --system-site-packages "$PYTHON_DIR"
+else
+    # default behavior for virtualenv>1.7 is
+    # --no-site-packages
+    virtualenv  "$PYTHON_DIR"
+fi
+
+# change to mitx python virtualenv
+source $PYTHON_DIR/bin/activate
 
 if [[ -n $compile ]]; then
     output "Downloading numpy and scipy"
@@ -297,39 +303,54 @@ if [[ -n $compile ]]; then
     rm -f numpy.tar.gz scipy.tar.gz
     output "Compiling numpy"
     cd "$BASE/numpy-${NUMPY_VER}"
-    python setup.py install 
+    python setup.py install
     output "Compiling scipy"
     cd "$BASE/scipy-${SCIPY_VER}"
-    python setup.py install 
+    python setup.py install
     cd "$BASE"
     rm -rf numpy-${NUMPY_VER} scipy-${SCIPY_VER}
 fi
 
+case `uname -s` in
+    Darwin)
+        # on mac os x get the latest distribute and pip
+        curl http://python-distribute.org/distribute_setup.py | python
+        pip install -U pip
+        # need latest pytz before compiling numpy and scipy
+        pip install -U pytz
+        pip install numpy
+        # fixes problem with scipy on 10.8
+        pip install -e git+https://github.com/scipy/scipy#egg=scipy-dev
+        ;;
+esac
+
 output "Installing MITx pre-requirements"
-pip install -r mitx/pre-requirements.txt 
+pip install -r mitx/pre-requirements.txt
 # Need to be in the mitx dir to get the paths to local modules right
 output "Installing MITx requirements"
 cd mitx
-pip install -r requirements.txt 
+pip install -r requirements.txt
 output "Installing askbot requirements"
-pip install -r askbot/askbot_requirements.txt 
-pip install -r askbot/askbot_requirements_dev.txt 
-
+pip install -r askbot/askbot_requirements.txt
+pip install -r askbot/askbot_requirements_dev.txt
 
 mkdir "$BASE/log" || true
 mkdir "$BASE/db" || true
 
+output "Fixing your git default settings"
+git config --global push.default current
+
 cat<<END
    Success!!
 
-   To start using Django you will need to activate the local Python 
+   To start using Django you will need to activate the local Python
    and Ruby environment (at this time rvm only supports bash) :
 
         $ source $RUBY_DIR/scripts/rvm
         $ source $PYTHON_DIR/bin/activate
-  
+
    To initialize Django
-        
+
         $ cd $BASE/mitx
         $ rake django-admin[syncdb]
         $ rake django-admin[migrate]
@@ -337,21 +358,20 @@ cat<<END
    To start the Django on port 8000
 
         $ rake lms
-   
+
    Or to start Django on a different <port#>
 
-        $ rake django-admin[runserver,lms,dev,<port#>]   
+        $ rake django-admin[runserver,lms,dev,<port#>]
 
-  If the Django development server starts properly you 
+  If the  Django development server starts properly you
   should see:
 
       Development server is running at http://127.0.0.1:<port#>/
       Quit the server with CONTROL-C.
 
-  Connect your browser to http://127.0.0.1:<port#> to 
+  Connect your browser to http://127.0.0.1:<port#> to
   view the Django site.
 
 
 END
 exit 0
-

lms/djangoapps/courseware/access.py

@@ -107,7 +107,7 @@ def _has_access_course_desc(user, course, action):
         NOTE: this is not checking whether user is actually enrolled in the course.
         """
         # delegate to generic descriptor check to check start dates
-        return _has_access_descriptor(user, course, action)
+        return _has_access_descriptor(user, course, 'load')
 
     def can_enroll():
         """

lms/djangoapps/courseware/grades.py

@@ -329,9 +329,15 @@ def progress_summary(student, request, course, student_module_cache):
 def get_score(course_id, user, problem_descriptor, module_creator, student_module_cache):
     """
     Return the score for a user on a problem, as a tuple (correct, total).
+    e.g. (5,7) if you got 5 out of 7 points.
+
+    If this problem doesn't have a score, or we couldn't load it, returns (None,
+    None).
 
     user: a Student object
-    problem: an XModule
+    problem_descriptor: an XModuleDescriptor
+    module_creator: a function that takes a descriptor, and returns the corresponding XModule for this user.
+           Can return None if user doesn't have access, or if something else went wrong.
     cache: A StudentModuleCache
     """
     if not (problem_descriptor.stores_state and problem_descriptor.has_score):
@@ -339,14 +345,16 @@ def get_score(course_id, user, problem_descriptor, module_creator, student_modul
         return (None, None)
 
     correct = 0.0
-    
+
     instance_module = student_module_cache.lookup(
         course_id, problem_descriptor.category, problem_descriptor.location.url())
-    
+
     if not instance_module:
         # If the problem was not in the cache, we need to instantiate the problem.
-        # Otherwise, the max score (cached in instance_module) won't be available 
+        # Otherwise, the max score (cached in instance_module) won't be available
         problem = module_creator(problem_descriptor)
+        if problem is None:
+            return (None, None)
         instance_module = get_instance_module(course_id, user, problem, student_module_cache)
 
     # If this problem is ungraded/ungradable, bail
@@ -361,7 +369,7 @@ def get_score(course_id, user, problem_descriptor, module_creator, student_modul
         weight = getattr(problem_descriptor, 'weight', None)
         if weight is not None:
             if total == 0:
-                log.exception("Cannot reweight a problem with zero weight. Problem: " + str(instance_module))
+                log.exception("Cannot reweight a problem with zero total points. Problem: " + str(instance_module))
                 return (correct, total)
             correct = correct * weight / total
             total = weight

lms/djangoapps/courseware/module_render.py

 import hashlib
 import json
 import logging
+import pyparsing
 import sys
 
 from django.conf import settings
@@ -13,6 +14,7 @@ from django.views.decorators.csrf import csrf_exempt
 from requests.auth import HTTPBasicAuth
 
 from capa.xqueue_interface import XQueueInterface
+from capa.chem import chemcalc
 from courseware.access import has_access
 from mitxmako.shortcuts import render_to_string
 from models import StudentModule, StudentModuleCache
@@ -471,3 +473,42 @@ def modx_dispatch(request, dispatch, location, course_id):
 
     # Return whatever the module wanted to return to the client/caller
     return HttpResponse(ajax_return)
+
+def preview_chemcalc(request):
+    """
+    Render an html preview of a chemical formula or equation.  The fact that
+    this is here is a bit of hack.  See the note in lms/urls.py about why it's
+    here. (Victor is to blame.)
+
+    request should be a GET, with a key 'formula' and value 'some formula string'.
+
+    Returns a json dictionary:
+    {
+       'preview' : 'the-preview-html' or ''
+       'error' : 'the-error' or ''
+    }
+    """
+    if request.method != "GET":
+        raise Http404
+
+    result = {'preview': '',
+              'error': '' }
+    formula = request.GET.get('formula')
+    if formula is None:
+        result['error'] = "No formula specified."
+
+        return HttpResponse(json.dumps(result))
+
+    try:
+        result['preview'] = chemcalc.render_to_html(formula)
+    except pyparsing.ParseException as p:
+        result['error'] = "Couldn't parse formula: {0}".format(p)
+    except Exception:
+        # this is unexpected, so log
+        log.warning("Error while previewing chemical formula", exc_info=True)
+        result['error'] = "Error while rendering preview"
+
+    return HttpResponse(json.dumps(result))
+
+
+

lms/djangoapps/courseware/tabs.py

@@ -15,6 +15,8 @@ import logging
 from django.conf import settings
 from django.core.urlresolvers import reverse
 
+from fs.errors import ResourceNotFoundError
+
 from courseware.access import has_access
 from static_replace import replace_urls
 
@@ -263,7 +265,8 @@ def get_static_tab_contents(course, tab):
             try:
                 with fs.open(p) as tabfile:
                     # TODO: redundant with module_render.py.  Want to be helper methods in static_replace or something.
-                    contents = replace_urls(tabfile.read(), course.metadata['data_dir'])
+                    text = tabfile.read().decode('utf-8')
+                    contents = replace_urls(text, course.metadata['data_dir'])
                     return replace_urls(contents, staticfiles_prefix='/courses/'+course.id, replace_prefix='/course/')
             except (ResourceNotFoundError) as err:
                 log.exception("Couldn't load tab contents from '{0}': {1}".format(p, err))

lms/djangoapps/courseware/views.py

@@ -362,7 +362,7 @@ def static_tab(request, course_id, tab_slug):
     tab = tabs.get_static_tab_by_slug(course, tab_slug)
     if tab is None:
         raise Http404
-    
+
     contents = tabs.get_static_tab_contents(course, tab)
     if contents is None:
         raise Http404
@@ -421,6 +421,16 @@ def course_about(request, course_id):
 
 @ensure_csrf_cookie
 @cache_if_anonymous
+def static_university_profile(request, org_id):
+    """
+    Return the profile for the particular org_id that does not have any courses.
+    """
+    template_file = "university_profile/{0}.html".format(org_id).lower()
+    context = dict(courses=[], org_id=org_id)
+    return render_to_response(template_file, context)
+
+@ensure_csrf_cookie
+@cache_if_anonymous
 def university_profile(request, org_id):
     """
     Return the profile for the particular org_id.  404 if it's not valid.
@@ -491,7 +501,7 @@ def progress(request, course_id, student_id=None):
     courseware_summary = grades.progress_summary(student, request, course,
                                                  student_module_cache)
     grade_summary = grades.grade(student, request, course, student_module_cache)
-    
+
     if courseware_summary is None:
         #This means the student didn't have access to the course (which the instructor requested)
         raise Http404
@@ -504,4 +514,3 @@ def progress(request, course_id, student_id=None):
     context.update()
 
     return render_to_response('courseware/progress.html', context)
-

lms/djangoapps/django_comment_client/management/commands/seed_permissions_roles.py

@@ -14,6 +14,7 @@ class Command(BaseCommand):
         course_id = args[0]
         administrator_role = Role.objects.get_or_create(name="Administrator", course_id=course_id)[0]
         moderator_role = Role.objects.get_or_create(name="Moderator", course_id=course_id)[0]
+        community_ta_role = Role.objects.get_or_create(name="Community TA", course_id=course_id)[0]
         student_role = Role.objects.get_or_create(name="Student", course_id=course_id)[0]
 
         for per in ["vote", "update_thread", "follow_thread", "unfollow_thread",
@@ -30,4 +31,7 @@ class Command(BaseCommand):
 
         moderator_role.inherit_permissions(student_role)
 
+        # For now, Community TA == Moderator, except for the styling.
+        community_ta_role.inherit_permissions(moderator_role)
+
         administrator_role.inherit_permissions(moderator_role)

lms/djangoapps/instructor/management/commands/dump_grades.py

+#!/usr/bin/python
+#
+# django management command: dump grades to csv files
+# for use by batch processes
+
+import os, sys, string
+import datetime
+import json
+
+from instructor.views import *
+from courseware.courses import get_course_by_id
+from xmodule.modulestore.django import modulestore
+
+from django.conf import settings
+from django.core.management.base import BaseCommand
+
+class Command(BaseCommand):
+    help = "dump grades to CSV file.  Usage: dump_grades course_id_or_dir filename dump_type\n"
+    help += "   course_id_or_dir: either course_id or course_dir\n"
+    help += "   filename: where the output CSV is to be stored\n"
+    # help += "   start_date: end date as M/D/Y H:M (defaults to end of available data)"
+    help += "   dump_type: 'all' or 'raw' (see instructor dashboard)"
+
+    def handle(self, *args, **options):
+
+        # current grading logic and data schema doesn't handle dates
+        # datetime.strptime("21/11/06 16:30", "%m/%d/%y %H:%M")
+
+        print "args = ", args
+
+        course_id = 'MITx/8.01rq_MW/Classical_Mechanics_Reading_Questions_Fall_2012_MW_Section'
+        fn = "grades.csv"
+        get_raw_scores = False
+
+        if len(args)>0:
+            course_id = args[0]
+        if len(args)>1:
+            fn = args[1]
+        if len(args)>2:
+            get_raw_scores = args[2].lower()=='raw'
+
+        request = self.DummyRequest()
+        try:
+            course = get_course_by_id(course_id)
+        except Exception as err:
+            if course_id in modulestore().courses:
+                course = modulestore().courses[course_id]
+            else:
+                print "-----------------------------------------------------------------------------"
+                print "Sorry, cannot find course %s" % course_id
+                print "Please provide a course ID or course data directory name, eg content-mit-801rq"
+                return
+
+        print "-----------------------------------------------------------------------------"
+        print "Dumping grades from %s to file %s (get_raw_scores=%s)" % (course.id, fn, get_raw_scores)
+        datatable = get_student_grade_summary_data(request, course, course.id, get_raw_scores=get_raw_scores)
+    
+        fp = open(fn,'w')
+    
+        writer = csv.writer(fp, dialect='excel', quotechar='"', quoting=csv.QUOTE_ALL)
+        writer.writerow(datatable['header'])
+        for datarow in datatable['data']:
+            encoded_row = [unicode(s).encode('utf-8') for s in datarow]
+            writer.writerow(encoded_row)
+    
+        fp.close()
+        print "Done: %d records dumped" % len(datatable['data'])
+
+    class DummyRequest(object):
+        META = {}
+        def __init__(self):
+            return
+        def get_host(self):
+            return 'edx.mit.edu'
+        def is_secure(self):
+            return False
+
+    
+        

lms/djangoapps/licenses/management/commands/generate_serial_numbers.py

+import os.path
+from uuid import uuid4
+from optparse import make_option
+
+from django.utils.html import escape
+from django.core.management.base import BaseCommand, CommandError
+
+from xmodule.modulestore.django import modulestore
+
+from licenses.models import CourseSoftware, UserLicense
+
+
+class Command(BaseCommand):
+    help = """Generate random serial numbers for software used in a course.
+
+    Usage: generate_serial_numbers <course_id> <software_name> <count>
+
+    <count> is the number of numbers to generate.
+
+    Example:
+
+       import_serial_numbers MITx/6.002x/2012_Fall matlab 100
+
+    """
+    args = "course_id software_id count"
+
+    def handle(self, *args, **options):
+        """
+        """
+        course_id, software_name, count = self._parse_arguments(args)
+
+        software, _ = CourseSoftware.objects.get_or_create(course_id=course_id,
+                                                           name=software_name)
+        self._generate_serials(software, count)
+
+    def _parse_arguments(self, args):
+        if len(args) != 3:
+            raise CommandError("Incorrect number of arguments")
+
+        course_id = args[0]
+        courses = modulestore().get_courses()
+        known_course_ids = set(c.id for c in courses)
+
+        if course_id not in known_course_ids:
+            raise CommandError("Unknown course_id")
+
+        software_name = escape(args[1].lower())
+
+        try:
+            count = int(args[2])
+        except ValueError:
+            raise CommandError("Invalid <count> argument.")
+
+        return course_id, software_name, count
+
+    def _generate_serials(self, software, count):
+        print "Generating {0} serials".format(count)
+
+        # add serial numbers them to the database
+        for _ in xrange(count):
+            serial = str(uuid4())
+            license = UserLicense(software=software, serial=serial)
+            license.save()
+
+        print "{0} new serial numbers generated.".format(count)

lms/djangoapps/licenses/management/commands/import_serial_numbers.py

+import os.path
+from optparse import make_option
+
+from django.utils.html import escape
+from django.core.management.base import BaseCommand, CommandError
+
+from xmodule.modulestore.django import modulestore
+
+from licenses.models import CourseSoftware, UserLicense
+
+
+class Command(BaseCommand):
+    help = """Imports serial numbers for software used in a course.
+
+    Usage: import_serial_numbers <course_id> <software_name> <file>
+
+    <file> is a text file that list one available serial number per line.
+
+    Example:
+
+       import_serial_numbers MITx/6.002x/2012_Fall matlab serials.txt
+
+    """
+    args = "course_id software_id serial_file"
+
+    def handle(self, *args, **options):
+        """
+        """
+        course_id, software_name, filename = self._parse_arguments(args)
+
+        software, _ = CourseSoftware.objects.get_or_create(course_id=course_id,
+                                                           name=software_name)
+        self._import_serials(software, filename)
+
+    def _parse_arguments(self, args):
+        if len(args) != 3:
+            raise CommandError("Incorrect number of arguments")
+
+        course_id = args[0]
+        courses = modulestore().get_courses()
+        known_course_ids = set(c.id for c in courses)
+
+        if course_id not in known_course_ids:
+            raise CommandError("Unknown course_id")
+
+        software_name = escape(args[1].lower())
+
+        filename = os.path.abspath(args[2])
+        if not os.path.exists(filename):
+            raise CommandError("Cannot find filename {0}".format(filename))
+
+        return course_id, software_name, filename
+
+    def _import_serials(self, software, filename):
+        print "Importing serial numbers for {0}.".format(software)
+
+        serials = set(unicode(l.strip()) for l in open(filename))
+
+        # remove serial numbers we already have
+        licenses = UserLicense.objects.filter(software=software)
+        known_serials = set(l.serial for l in licenses)
+        if known_serials:
+            serials = serials.difference(known_serials)
+
+        # add serial numbers them to the database
+        for serial in serials:
+            license = UserLicense(software=software, serial=serial)
+            license.save()
+
+        print "{0} new serial numbers imported.".format(len(serials))

lms/djangoapps/licenses/migrations/0001_initial.py

+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding model 'CourseSoftware'
+        db.create_table('licenses_coursesoftware', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=255)),
+            ('full_name', self.gf('django.db.models.fields.CharField')(max_length=255)),
+            ('url', self.gf('django.db.models.fields.CharField')(max_length=255)),
+            ('course_id', self.gf('django.db.models.fields.CharField')(max_length=255)),
+        ))
+        db.send_create_signal('licenses', ['CourseSoftware'])
+
+        # Adding model 'UserLicense'
+        db.create_table('licenses_userlicense', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('software', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['licenses.CourseSoftware'])),
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'], null=True)),
+            ('serial', self.gf('django.db.models.fields.CharField')(max_length=255)),
+        ))
+        db.send_create_signal('licenses', ['UserLicense'])
+
+
+    def backwards(self, orm):
+        # Deleting model 'CourseSoftware'
+        db.delete_table('licenses_coursesoftware')
+
+        # Deleting model 'UserLicense'
+        db.delete_table('licenses_userlicense')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'about': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'avatar_type': ('django.db.models.fields.CharField', [], {'default': "'n'", 'max_length': '1'}),
+            'bronze': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}),
+            'consecutive_days_visit_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'country': ('django_countries.fields.CountryField', [], {'max_length': '2', 'blank': 'True'}),
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'date_of_birth': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'display_tag_filter_strategy': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'email_isvalid': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'email_key': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
+            'email_tag_filter_strategy': ('django.db.models.fields.SmallIntegerField', [], {'default': '1'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'gold': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}),
+            'gravatar': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ignored_tags': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'interesting_tags': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'last_seen': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'location': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+            'new_response_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'questions_per_page': ('django.db.models.fields.SmallIntegerField', [], {'default': '10'}),
+            'real_name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+            'reputation': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1'}),
+            'seen_response_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'show_country': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'silver': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}),
+            'status': ('django.db.models.fields.CharField', [], {'default': "'w'", 'max_length': '2'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
+            'website': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'licenses.coursesoftware': {
+            'Meta': {'object_name': 'CourseSoftware'},
+            'course_id': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'full_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'url': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        'licenses.userlicense': {
+            'Meta': {'object_name': 'UserLicense'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'serial': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'software': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['licenses.CourseSoftware']"}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'})
+        }
+    }
+
+    complete_apps = ['licenses']
\ No newline at end of file

lms/djangoapps/licenses/models.py

+import logging
+
+from django.db import models, transaction
+
+from student.models import User
+
+log = logging.getLogger("mitx.licenses")
+
+
+class CourseSoftware(models.Model):
+    name = models.CharField(max_length=255)
+    full_name = models.CharField(max_length=255)
+    url = models.CharField(max_length=255)
+    course_id = models.CharField(max_length=255)
+
+    def __unicode__(self):
+        return u'{0} for {1}'.format(self.name, self.course_id)
+
+
+class UserLicense(models.Model):
+    software = models.ForeignKey(CourseSoftware, db_index=True)
+    user = models.ForeignKey(User, null=True)
+    serial = models.CharField(max_length=255)
+
+
+def get_courses_licenses(user, courses):
+    course_ids = set(course.id for course in courses)
+    all_software = CourseSoftware.objects.filter(course_id__in=course_ids)
+
+    assigned_licenses = UserLicense.objects.filter(software__in=all_software,
+                                                   user=user)
+
+    licenses = dict.fromkeys(all_software, None)
+    for license in assigned_licenses:
+        licenses[license.software] = license
+
+    log.info(assigned_licenses)
+    log.info(licenses)
+
+    return licenses
+
+
+def get_license(user, software):
+    try:
+        # TODO: temporary fix for when somehow a user got more that one license.
+        # The proper fix should use Meta.unique_together in the UserLicense model.
+        licenses = UserLicense.objects.filter(user=user, software=software)
+        license = licenses[0] if licenses else None
+    except UserLicense.DoesNotExist:
+        license = None
+
+    return license
+
+
+def get_or_create_license(user, software):
+    license = get_license(user, software)
+    if license is None:
+        license = _create_license(user, software)
+
+    return license
+
+
+def _create_license(user, software):
+    license = None
+
+    try:
+        # find one license that has not been assigned, locking the
+        # table/rows with select_for_update to prevent race conditions
+        with transaction.commit_on_success():
+            selected = UserLicense.objects.select_for_update()
+            license = selected.filter(user__isnull=True, software=software)[0]
+            license.user = user
+            license.save()
+    except IndexError:
+        # there are no free licenses
+        log.error('No serial numbers available for {0}', software)
+        license = None
+        # TODO [rocha]look if someone has unenrolled from the class
+        # and already has a serial number
+
+    return license

lms/djangoapps/licenses/tests.py

+import logging
+from uuid import uuid4
+from random import shuffle
+from tempfile import NamedTemporaryFile
+
+from django.test import TestCase
+from django.core.management import call_command
+
+from models import CourseSoftware, UserLicense
+
+COURSE_1 = 'edX/toy/2012_Fall'
+
+SOFTWARE_1 = 'matlab'
+SOFTWARE_2 = 'stata'
+
+log = logging.getLogger(__name__)
+
+
+class CommandTest(TestCase):
+    def test_import_serial_numbers(self):
+        size = 20
+
+        log.debug('Adding one set of serials for {0}'.format(SOFTWARE_1))
+        with generate_serials_file(size) as temp_file:
+            args = [COURSE_1, SOFTWARE_1, temp_file.name]
+            call_command('import_serial_numbers', *args)
+
+        log.debug('Adding one set of serials for {0}'.format(SOFTWARE_2))
+        with generate_serials_file(size) as temp_file:
+            args = [COURSE_1, SOFTWARE_2, temp_file.name]
+            call_command('import_serial_numbers', *args)
+
+        log.debug('There should be only 2 course-software entries')
+        software_count = CourseSoftware.objects.all().count()
+        self.assertEqual(2, software_count)
+
+        log.debug('We added two sets of {0} serials'.format(size))
+        licenses_count = UserLicense.objects.all().count()
+        self.assertEqual(2 * size, licenses_count)
+
+        log.debug('Adding more serial numbers to {0}'.format(SOFTWARE_1))
+        with generate_serials_file(size) as temp_file:
+            args = [COURSE_1, SOFTWARE_1, temp_file.name]
+            call_command('import_serial_numbers', *args)
+
+        log.debug('There should be still only 2 course-software entries')
+        software_count = CourseSoftware.objects.all().count()
+        self.assertEqual(2, software_count)
+
+        log.debug('Now we should have 3 sets of 20 serials'.format(size))
+        licenses_count = UserLicense.objects.all().count()
+        self.assertEqual(3 * size, licenses_count)
+
+        cs = CourseSoftware.objects.get(pk=1)
+
+        lics = UserLicense.objects.filter(software=cs)[:size]
+        known_serials = list(l.serial for l in lics)
+        known_serials.extend(generate_serials(10))
+
+        shuffle(known_serials)
+
+        log.debug('Adding some new and old serials to {0}'.format(SOFTWARE_1))
+        with NamedTemporaryFile() as f:
+            f.write('\n'.join(known_serials))
+            f.flush()
+            args = [COURSE_1, SOFTWARE_1, f.name]
+            call_command('import_serial_numbers', *args)
+
+        log.debug('Check if we added only the new ones')
+        licenses_count = UserLicense.objects.filter(software=cs).count()
+        self.assertEqual((2 * size) + 10, licenses_count)
+
+
+def generate_serials(size=20):
+    return [str(uuid4()) for _ in range(size)]
+
+
+def generate_serials_file(size=20):
+    serials = generate_serials(size)
+
+    temp_file = NamedTemporaryFile()
+    temp_file.write('\n'.join(serials))
+    temp_file.flush()
+
+    return temp_file

lms/djangoapps/licenses/views.py

+import logging
+import json
+import re
+from urlparse import urlparse
+from collections import namedtuple, defaultdict
+
+
+from mitxmako.shortcuts import render_to_string
+
+from django.contrib.auth.models import User
+from django.http import HttpResponse, Http404
+from django.views.decorators.csrf import requires_csrf_token, csrf_protect
+
+from models import CourseSoftware
+from models import get_courses_licenses, get_or_create_license, get_license
+
+
+log = logging.getLogger("mitx.licenses")
+
+
+License = namedtuple('License', 'software serial')
+
+
+def get_licenses_by_course(user, courses):
+    licenses = get_courses_licenses(user, courses)
+    licenses_by_course = defaultdict(list)
+
+    # create missing licenses and group by course_id
+    for software, license in licenses.iteritems():
+        if license is None:
+            licenses[software] = get_or_create_license(user, software)
+
+        course_id = software.course_id
+        serial = license.serial if license else None
+        licenses_by_course[course_id].append(License(software, serial))
+
+    # render elements
+    data_by_course = {}
+    for course_id, licenses in licenses_by_course.iteritems():
+        context = {'licenses': licenses}
+        template = 'licenses/serial_numbers.html'
+        data_by_course[course_id] = render_to_string(template, context)
+
+    return data_by_course
+
+
+@requires_csrf_token
+def user_software_license(request):
+    if request.method != 'POST' or not request.is_ajax():
+        raise Http404
+
+    # get the course id from the referer
+    url_path = urlparse(request.META.get('HTTP_REFERER', '')).path
+    pattern = re.compile('^/courses/(?P<id>[^/]+/[^/]+/[^/]+)/.*/?$')
+    match = re.match(pattern, url_path)
+
+    if not match:
+        raise Http404
+    course_id = match.groupdict().get('id', '')
+
+    user_id = request.session.get('_auth_user_id')
+    software_name = request.POST.get('software')
+    generate = request.POST.get('generate', False) == 'true'
+
+    try:
+        software = CourseSoftware.objects.get(name=software_name,
+                                              course_id=course_id)
+        print software
+    except CourseSoftware.DoesNotExist:
+        raise Http404
+
+    user = User.objects.get(id=user_id)
+
+    if generate:
+        license = get_or_create_license(user, software)
+    else:
+        license = get_license(user, software)
+
+    if license:
+        response = {'serial': license.serial}
+    else:
+        response = {'error': 'No serial number found'}
+
+    return HttpResponse(json.dumps(response), mimetype='application/json')

lms/envs/common.py

@@ -89,6 +89,7 @@ GENERATE_PROFILE_SCORES = False
 # Used with XQueue
 XQUEUE_WAITTIME_BETWEEN_REQUESTS = 5 # seconds
 
+
 ############################# SET PATH INFORMATION #############################
 PROJECT_ROOT = path(__file__).abspath().dirname().dirname()  # /mitx/lms
 REPO_ROOT = PROJECT_ROOT.dirname()
@@ -96,7 +97,6 @@ COMMON_ROOT = REPO_ROOT / "common"
 ENV_ROOT = REPO_ROOT.dirname()  # virtualenv dir /mitx is in
 COURSES_ROOT = ENV_ROOT / "data"
 
-# FIXME: To support multiple courses, we should walk the courses dir at startup
 DATA_DIR = COURSES_ROOT
 
 sys.path.append(REPO_ROOT)
@@ -118,8 +118,11 @@ node_paths = [COMMON_ROOT / "static/js/vendor",
 NODE_PATH = ':'.join(node_paths)
 
 
+# Where to look for a status message
+STATUS_MESSAGE_PATH = ENV_ROOT / "status_message.json"
+
 ############################ OpenID Provider  ##################################
-OPENID_PROVIDER_TRUSTED_ROOTS = ['cs50.net', '*.cs50.net'] 
+OPENID_PROVIDER_TRUSTED_ROOTS = ['cs50.net', '*.cs50.net']
 
 ################################## MITXWEB #####################################
 # This is where we stick our compiled template files. Most of the app uses Mako
@@ -147,7 +150,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     #'django.core.context_processors.i18n',
     'django.contrib.auth.context_processors.auth', #this is required for admin
     'django.core.context_processors.csrf', #necessary for csrf protection
-    
+
     # Added for django-wiki
     'django.core.context_processors.media',
     'django.core.context_processors.tz',
@@ -315,7 +318,7 @@ WIKI_CAN_ASSIGN = lambda article, user: user.is_staff or user.is_superuser
 
 WIKI_USE_BOOTSTRAP_SELECT_WIDGET = False
 WIKI_LINK_LIVE_LOOKUPS = False
-WIKI_LINK_DEFAULT_LEVEL = 2 
+WIKI_LINK_DEFAULT_LEVEL = 2
 
 ################################# Jasmine ###################################
 JASMINE_TEST_DIRECTORY = PROJECT_ROOT + '/static/coffee'
@@ -332,10 +335,9 @@ STATICFILES_FINDERS = (
 TEMPLATE_LOADERS = (
     'mitxmako.makoloader.MakoFilesystemLoader',
     'mitxmako.makoloader.MakoAppDirectoriesLoader',
- 
+
     # 'django.template.loaders.filesystem.Loader',
     # 'django.template.loaders.app_directories.Loader',
-    
     # 'django.template.loaders.eggs.Loader',
 )
 
@@ -353,7 +355,7 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.messages.middleware.MessageMiddleware',
     'track.middleware.TrackMiddleware',
     'mitxmako.middleware.MakoMiddleware',
-    
+
     'course_wiki.course_nav.Middleware',
 
     'django.middleware.transaction.TransactionMiddleware',
@@ -487,8 +489,6 @@ PIPELINE_JS_COMPRESSOR = None
 STATICFILES_IGNORE_PATTERNS = (
     "sass/*",
     "coffee/*",
-    "*.py",
-    "*.pyc"
 )
 
 PIPELINE_YUI_BINARY = 'yui-compressor'
@@ -526,7 +526,8 @@ INSTALLED_APPS = (
     'certificates',
     'instructor',
     'psychometrics',
-    
+    'licenses',
+
     #For the wiki
     'wiki', # The new django-wiki from benjaoming
     'django_notify',

lms/envs/test.py

@@ -27,12 +27,18 @@ SOUTH_TESTS_MIGRATE = False # To disable migrations and use syncdb instead
 
 # Nose Test Runner
 INSTALLED_APPS += ('django_nose',)
-NOSE_ARGS = ['--cover-erase', '--with-xunit', '--with-xcoverage', '--cover-html',
-             # '-v', '--pdb',     # When really stuck, uncomment to start debugger on error
-             '--cover-inclusive', '--cover-html-dir',
-             os.environ.get('NOSE_COVER_HTML_DIR', 'cover_html')]
-for app in os.listdir(PROJECT_ROOT / 'djangoapps'):
-    NOSE_ARGS += ['--cover-package', app]
+NOSE_ARGS = []
+
+# Turning off coverage speeds up tests dramatically... until we have better config,
+# leave it here for manual fiddling.
+_coverage = True
+if _coverage:
+    NOSE_ARGS = ['--cover-erase', '--with-xunit', '--with-xcoverage', '--cover-html',
+                 # '-v', '--pdb',     # When really stuck, uncomment to start debugger on error
+                 '--cover-inclusive', '--cover-html-dir',
+                 os.environ.get('NOSE_COVER_HTML_DIR', 'cover_html')]
+    for app in os.listdir(PROJECT_ROOT / 'djangoapps'):
+        NOSE_ARGS += ['--cover-package', app]
 TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
 
 # Local Directories
@@ -40,6 +46,8 @@ TEST_ROOT = path("test_root")
 # Want static files in the same dir for running on jenkins.
 STATIC_ROOT = TEST_ROOT / "staticfiles"
 
+STATUS_MESSAGE_PATH = TEST_ROOT / "status_message.json"
+
 COURSES_ROOT = TEST_ROOT / "data"
 DATA_DIR = COURSES_ROOT
 
@@ -77,26 +85,23 @@ STATICFILES_DIRS += [
     if os.path.isdir(COMMON_TEST_DATA_ROOT / course_dir)
 ]
 
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': PROJECT_ROOT / "db" / "mitx.db",
-    },
+# point tests at the test courses by default
 
-    # The following are for testing purposes...
-    'edX/toy/2012_Fall': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': ENV_ROOT / "db" / "course1.db",
-    },
+MODULESTORE = {
+    'default': {
+        'ENGINE': 'xmodule.modulestore.xml.XMLModuleStore',
+        'OPTIONS': {
+            'data_dir': COMMON_TEST_DATA_ROOT,
+            'default_class': 'xmodule.hidden_module.HiddenDescriptor',
+        }
+    }
+}
 
-    'edx/full/6.002_Spring_2012': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': ENV_ROOT / "db" / "course2.db",
-    },
 
-    'edX/toy/TT_2012_Fall': {
+DATABASES = {
+    'default': {
         'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': ENV_ROOT / "db" / "course3.db",
+        'NAME': PROJECT_ROOT / "db" / "mitx.db",
     },
 
 }
@@ -157,3 +162,15 @@ FILE_UPLOAD_HANDLERS = (
     'django.core.files.uploadhandler.MemoryFileUploadHandler',
     'django.core.files.uploadhandler.TemporaryFileUploadHandler',
 )
+
+################### Make tests faster
+
+#http://slacy.com/blog/2012/04/make-your-tests-faster-in-django-1-4/
+PASSWORD_HASHERS = (
+    # 'django.contrib.auth.hashers.PBKDF2PasswordHasher',
+    # 'django.contrib.auth.hashers.PBKDF2SHA1PasswordHasher',
+    # 'django.contrib.auth.hashers.BCryptPasswordHasher',
+    'django.contrib.auth.hashers.SHA1PasswordHasher',
+    'django.contrib.auth.hashers.MD5PasswordHasher',
+    # 'django.contrib.auth.hashers.CryptPasswordHasher',
+)