From c288ee7be00dfa845336e5cf308e556aee62167b Mon Sep 17 00:00:00 2001 From: Sanford Student Date: Mon, 5 Jun 2017 10:15:13 -0400 Subject: [PATCH] adding model --- lms/djangoapps/instructor_task/admin.py | 3 ++ .../instructor_task/config/__init__.py | 0 .../instructor_task/config/models.py | 14 +++++++++ .../migrations/0002_gradereportsetting.py | 31 +++++++++++++++++++ 4 files changed, 48 insertions(+) create mode 100644 lms/djangoapps/instructor_task/config/__init__.py create mode 100644 lms/djangoapps/instructor_task/config/models.py create mode 100644 lms/djangoapps/instructor_task/migrations/0002_gradereportsetting.py diff --git a/lms/djangoapps/instructor_task/admin.py b/lms/djangoapps/instructor_task/admin.py index 2d70a065b6..02d4885130 100644 --- a/lms/djangoapps/instructor_task/admin.py +++ b/lms/djangoapps/instructor_task/admin.py @@ -5,8 +5,10 @@ This will mostly involve searching by course_id or task_id and manually failing a task. """ +from config_models.admin import ConfigurationModelAdmin from django.contrib import admin from .models import InstructorTask +from .config.models import GradeReportSetting class InstructorTaskAdmin(admin.ModelAdmin): @@ -34,3 +36,4 @@ class InstructorTaskAdmin(admin.ModelAdmin): email.admin_order_field = 'requester__username' admin.site.register(InstructorTask, InstructorTaskAdmin) +admin.site.register(GradeReportSetting, ConfigurationModelAdmin) diff --git a/lms/djangoapps/instructor_task/config/__init__.py b/lms/djangoapps/instructor_task/config/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lms/djangoapps/instructor_task/config/models.py b/lms/djangoapps/instructor_task/config/models.py new file mode 100644 index 0000000000..795c1138df --- /dev/null +++ b/lms/djangoapps/instructor_task/config/models.py @@ -0,0 +1,14 @@ +""" +Models for configuration of settings relevant +to instructor tasks. +""" +from config_models.models import ConfigurationModel +from django.db.models import IntegerField + + +class GradeReportSetting(ConfigurationModel): + """ + Sets the batch size used when running grade reports + with multiple celery workers. + """ + batch_size = IntegerField(default=100) diff --git a/lms/djangoapps/instructor_task/migrations/0002_gradereportsetting.py b/lms/djangoapps/instructor_task/migrations/0002_gradereportsetting.py new file mode 100644 index 0000000000..70838e1260 --- /dev/null +++ b/lms/djangoapps/instructor_task/migrations/0002_gradereportsetting.py @@ -0,0 +1,31 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion +from django.conf import settings + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('instructor_task', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='GradeReportSetting', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('change_date', models.DateTimeField(auto_now_add=True, verbose_name='Change date')), + ('enabled', models.BooleanField(default=False, verbose_name='Enabled')), + ('batch_size', models.IntegerField(default=100)), + ('changed_by', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, editable=False, to=settings.AUTH_USER_MODEL, null=True, verbose_name='Changed by')), + ], + options={ + 'ordering': ('-change_date',), + 'abstract': False, + }, + ), + ]