Merge pull request #938 from MITx/fix/cdodge/pre-push-tweeks

Fix/cdodge/pre push tweeks

cms/djangoapps/contentstore/views.py

@@ -826,6 +826,10 @@ def remove_user(request, location):
     if user is None:
         return create_json_response('Could not find user by email address \'{0}\'.'.format(email))
 
+    # make sure we're not removing ourselves
+    if user.id == request.user.id:
+        raise PermissionDenied()
+
     remove_user_from_course_group(request.user, user, location, STAFF_ROLE_NAME)
 
     return create_json_response()

cms/static/js/base.js

@@ -185,7 +185,7 @@ function getEdxTimeFromDateTimeVals(date_val, time_val, format) {
             time_val = '00:00';
 
         // Note, we are using date.js utility which has better parsing abilities than the built in JS date parsing
-        date = Date.parse(date_val+" "+time_val);
+        date = Date.parse(date_val + " " + time_val);
         if (format == null)
             format = 'yyyy-MM-ddTHH:mm';