From e20fe2b879dc1d8349d7c238439aff1a62dc8915 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Fri, 5 Dec 2014 13:32:00 -0500 Subject: [PATCH] Add a configuration model for managing XBlockAsides --- lms/djangoapps/__init__.py | 0 lms/djangoapps/lms_xblock/admin.py | 5 ++ .../lms_xblock/migrations/0001_initial.py | 74 +++++++++++++++++++ .../lms_xblock/migrations/__init__.py | 0 lms/djangoapps/lms_xblock/models.py | 13 ++++ 5 files changed, 92 insertions(+) create mode 100644 lms/djangoapps/__init__.py create mode 100644 lms/djangoapps/lms_xblock/admin.py create mode 100644 lms/djangoapps/lms_xblock/migrations/0001_initial.py create mode 100644 lms/djangoapps/lms_xblock/migrations/__init__.py create mode 100644 lms/djangoapps/lms_xblock/models.py diff --git a/lms/djangoapps/__init__.py b/lms/djangoapps/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lms/djangoapps/lms_xblock/admin.py b/lms/djangoapps/lms_xblock/admin.py new file mode 100644 index 0000000000..451903245c --- /dev/null +++ b/lms/djangoapps/lms_xblock/admin.py @@ -0,0 +1,5 @@ +from django.contrib import admin +from config_models.admin import ConfigurationModelAdmin +from lms.djangoapps.lms_xblock.models import XBlockAsidesConfig + +admin.site.register(XBlockAsidesConfig, ConfigurationModelAdmin) diff --git a/lms/djangoapps/lms_xblock/migrations/0001_initial.py b/lms/djangoapps/lms_xblock/migrations/0001_initial.py new file mode 100644 index 0000000000..f4cdb0c97d --- /dev/null +++ b/lms/djangoapps/lms_xblock/migrations/0001_initial.py @@ -0,0 +1,74 @@ +# -*- 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 'XBlockAsidesConfig' + db.create_table('lms_xblock_xblockasidesconfig', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('change_date', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), + ('changed_by', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'], null=True, on_delete=models.PROTECT)), + ('enabled', self.gf('django.db.models.fields.BooleanField')(default=False)), + ('disabled_blocks', self.gf('django.db.models.fields.TextField')(default='about course_info static_tab')), + )) + db.send_create_signal('lms_xblock', ['XBlockAsidesConfig']) + + + def backwards(self, orm): + # Deleting model 'XBlockAsidesConfig' + db.delete_table('lms_xblock_xblockasidesconfig') + + + 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'}) + }, + 'lms_xblock.xblockasidesconfig': { + 'Meta': {'object_name': 'XBlockAsidesConfig'}, + 'change_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'changed_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'on_delete': 'models.PROTECT'}), + 'disabled_blocks': ('django.db.models.fields.TextField', [], {'default': "'about course_info static_tab'"}), + 'enabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) + } + } + + complete_apps = ['lms_xblock'] \ No newline at end of file diff --git a/lms/djangoapps/lms_xblock/migrations/__init__.py b/lms/djangoapps/lms_xblock/migrations/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lms/djangoapps/lms_xblock/models.py b/lms/djangoapps/lms_xblock/models.py new file mode 100644 index 0000000000..8d04dbae95 --- /dev/null +++ b/lms/djangoapps/lms_xblock/models.py @@ -0,0 +1,13 @@ +from django.db.models import TextField + +from config_models.models import ConfigurationModel + +class XBlockAsidesConfig(ConfigurationModel): + """ + Configuration for XBlockAsides. + """ + + disabled_blocks = TextField( + default="about course_info static_tab", + help_text="Space-separated list of XBlocks on which XBlockAsides should never render." + )