Course Reruns UI
Studio: adding course re-run-centric static template rendering * initial HTML for dashboard states * initial HTML for new course re-run view/form * initial HTML placeholder for outline alert UI Conflicts: cms/templates/index.html Studio: adding styling for course re-run-centric views * adding new view/page mast-wizard type * refactoring create course/element form styling * adding course re-run view specific styling * adding courses processing styling (w/ alerts and status) Course rerun server-side updates: support display_name and DuplicateCourseError. Studio: further design revisions and tweaks from feedback * removing new window attribute from re-run control * removing links from processing courses * revising look/feel of dismiss action on dashboard + alert * correcting font-weight of dashboard processing title * adding extra space to course rerun action on dashboard * re-wording secondary cancel action on rerun view Conflicts: cms/templates/index.html Added interation on unsucceeded courses in dashboard Studio: removing 'rel=external' property from course re-run actions Studio: removing hover styles for processing courses Fixed value bug in split and set course listing to display run moved task.py for rerun
This commit is contained in:
committed by
Ben McMorran
parent
a986b46cb1
commit
9f8f64cffe
@@ -113,7 +113,7 @@ class CourseRerunUIStateManager(CourseActionUIStateManager):
|
||||
FAILED = "failed"
|
||||
SUCCEEDED = "succeeded"
|
||||
|
||||
def initiated(self, source_course_key, destination_course_key, user):
|
||||
def initiated(self, source_course_key, destination_course_key, user, display_name):
|
||||
"""
|
||||
To be called when a new rerun is initiated for the given course by the given user.
|
||||
"""
|
||||
@@ -123,6 +123,7 @@ class CourseRerunUIStateManager(CourseActionUIStateManager):
|
||||
user=user,
|
||||
allow_not_found=True,
|
||||
source_course_key=source_course_key,
|
||||
display_name=display_name,
|
||||
)
|
||||
|
||||
def succeeded(self, course_key):
|
||||
|
||||
@@ -0,0 +1,76 @@
|
||||
# -*- 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 field 'CourseRerunState.display_name'
|
||||
db.add_column('course_action_state_coursererunstate', 'display_name',
|
||||
self.gf('django.db.models.fields.CharField')(default='', max_length=255),
|
||||
keep_default=False)
|
||||
|
||||
|
||||
def backwards(self, orm):
|
||||
# Deleting field 'CourseRerunState.display_name'
|
||||
db.delete_column('course_action_state_coursererunstate', 'display_name')
|
||||
|
||||
|
||||
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'},
|
||||
'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
|
||||
'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
|
||||
'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
|
||||
'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': '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'}),
|
||||
'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
|
||||
'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'})
|
||||
},
|
||||
'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'})
|
||||
},
|
||||
'course_action_state.coursererunstate': {
|
||||
'Meta': {'unique_together': "(('course_key', 'action'),)", 'object_name': 'CourseRerunState'},
|
||||
'action': ('django.db.models.fields.CharField', [], {'max_length': '100', 'db_index': 'True'}),
|
||||
'course_key': ('xmodule_django.models.CourseKeyField', [], {'max_length': '255', 'db_index': 'True'}),
|
||||
'created_time': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
|
||||
'created_user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'created_by_user+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
|
||||
'display_name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'message': ('django.db.models.fields.CharField', [], {'max_length': '1000'}),
|
||||
'should_display': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||
'source_course_key': ('xmodule_django.models.CourseKeyField', [], {'max_length': '255', 'db_index': 'True'}),
|
||||
'state': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
|
||||
'updated_time': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
|
||||
'updated_user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'updated_by_user+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"})
|
||||
}
|
||||
}
|
||||
|
||||
complete_apps = ['course_action_state']
|
||||
@@ -109,6 +109,9 @@ class CourseRerunState(CourseActionUIState):
|
||||
# Original course that is being rerun
|
||||
source_course_key = CourseKeyField(max_length=255, db_index=True)
|
||||
|
||||
# Display name for destination course
|
||||
display_name = models.CharField(max_length=255, default="")
|
||||
|
||||
# MANAGERS
|
||||
# Override the abstract class' manager with a Rerun-specific manager that inherits from the base class' manager.
|
||||
objects = CourseRerunUIStateManager()
|
||||
|
||||
@@ -17,10 +17,13 @@ class TestCourseRerunStateManager(TestCase):
|
||||
self.source_course_key = CourseLocator("source_org", "source_course_num", "source_run")
|
||||
self.course_key = CourseLocator("test_org", "test_course_num", "test_run")
|
||||
self.created_user = UserFactory()
|
||||
self.display_name = "destination course name"
|
||||
self.expected_rerun_state = {
|
||||
'created_user': self.created_user,
|
||||
'updated_user': self.created_user,
|
||||
'course_key': self.course_key,
|
||||
'source_course_key': self.source_course_key,
|
||||
"display_name": self.display_name,
|
||||
'action': CourseRerunUIStateManager.ACTION,
|
||||
'should_display': True,
|
||||
'message': "",
|
||||
@@ -53,10 +56,16 @@ class TestCourseRerunStateManager(TestCase):
|
||||
})
|
||||
self.verify_rerun_state()
|
||||
|
||||
def test_rerun_initiated(self):
|
||||
def initiate_rerun(self):
|
||||
CourseRerunState.objects.initiated(
|
||||
source_course_key=self.source_course_key, destination_course_key=self.course_key, user=self.created_user
|
||||
source_course_key=self.source_course_key,
|
||||
destination_course_key=self.course_key,
|
||||
user=self.created_user,
|
||||
display_name=self.display_name,
|
||||
)
|
||||
|
||||
def test_rerun_initiated(self):
|
||||
self.initiate_rerun()
|
||||
self.expected_rerun_state.update(
|
||||
{'state': CourseRerunUIStateManager.State.IN_PROGRESS}
|
||||
)
|
||||
@@ -64,9 +73,7 @@ class TestCourseRerunStateManager(TestCase):
|
||||
|
||||
def test_rerun_succeeded(self):
|
||||
# initiate
|
||||
CourseRerunState.objects.initiated(
|
||||
source_course_key=self.source_course_key, destination_course_key=self.course_key, user=self.created_user
|
||||
)
|
||||
self.initiate_rerun()
|
||||
|
||||
# set state to succeed
|
||||
CourseRerunState.objects.succeeded(course_key=self.course_key)
|
||||
@@ -80,9 +87,7 @@ class TestCourseRerunStateManager(TestCase):
|
||||
|
||||
def test_rerun_failed(self):
|
||||
# initiate
|
||||
CourseRerunState.objects.initiated(
|
||||
source_course_key=self.source_course_key, destination_course_key=self.course_key, user=self.created_user
|
||||
)
|
||||
self.initiate_rerun()
|
||||
|
||||
# set state to fail
|
||||
exception = Exception("failure in rerunning")
|
||||
|
||||
Reference in New Issue
Block a user