Merge pull request #10722 from edx/bd/sp-init

Initial migrations for verified deadlines for self paced

common/djangoapps/course_modes/migrations/0002_coursemode_expiration_datetime_is_explicit.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('course_modes', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='coursemode',
+            name='expiration_datetime_is_explicit',
+            field=models.BooleanField(default=True),
+        ),
+    ]

common/djangoapps/course_modes/models.py

@@ -63,6 +63,11 @@ class CourseMode(models.Model):
         ),
     )
 
+    # The system prefers to set this automatically based on default settings. But
+    # if the field is set manually we want a way to indicate that so we don't
+    # overwrite the manual setting of the field.
+    expiration_datetime_is_explicit = models.BooleanField(default=True)
+
     # DEPRECATED: the `expiration_date` field has been replaced by `expiration_datetime`
     expiration_date = models.DateField(default=None, null=True, blank=True)
 

lms/djangoapps/verify_student/migrations/0002_auto_20151124_1024.py

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('verify_student', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='historicalverificationdeadline',
+            name='deadline_is_explicit',
+            field=models.BooleanField(default=True),
+        ),
+        migrations.AddField(
+            model_name='verificationdeadline',
+            name='deadline_is_explicit',
+            field=models.BooleanField(default=True),
+        ),
+    ]

lms/djangoapps/verify_student/models.py

@@ -955,6 +955,11 @@ class VerificationDeadline(TimeStampedModel):
         )
     )
 
+    # The system prefers to set this automatically based on default settings. But
+    # if the field is set manually we want a way to indicate that so we don't
+    # overwrite the manual setting of the field.
+    deadline_is_explicit = models.BooleanField(default=True)
+
     # Maintain a history of changes to deadlines for auditing purposes
     history = HistoricalRecords()