From 1b7ff5dcbd70577700cef9f6079e76e41dc7a1f5 Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Thu, 28 Feb 2013 12:16:46 +0000 Subject: [PATCH] add text rightslevel --- pandora/config.indiancinema.jsonc | 2 +- .../text/migrations/0006_add_rightslevel.py | 88 +++++++++++++++++++ pandora/text/models.py | 5 +- 3 files changed, 93 insertions(+), 2 deletions(-) create mode 100644 pandora/text/migrations/0006_add_rightslevel.py diff --git a/pandora/config.indiancinema.jsonc b/pandora/config.indiancinema.jsonc index 852e8ccd..526feddb 100644 --- a/pandora/config.indiancinema.jsonc +++ b/pandora/config.indiancinema.jsonc @@ -43,7 +43,7 @@ "canManageUsers": {"staff": true, "admin": true}, "canPlayClips": {"guest": 3, "member": 3, "student": 3, "staff": 3, "admin": 3}, "canPlayVideo": {"guest": 1, "member": 1, "student": 3, "staff": 3, "admin": 3}, - "canReadText": {"guest": 0, "member": 0, "student": 1, "staff", 1, "admin": 1}, + "canReadText": {"guest": 0, "member": 0, "student": 1, "staff": 1, "admin": 1}, "canRemoveItems": {"staff": true, "admin": true}, "canSeeAccessed": {"student": true, "staff": true, "admin": true}, "canSeeDebugMenu": {"student": true, "staff": true, "admin": true}, diff --git a/pandora/text/migrations/0006_add_rightslevel.py b/pandora/text/migrations/0006_add_rightslevel.py new file mode 100644 index 00000000..9336a1bc --- /dev/null +++ b/pandora/text/migrations/0006_add_rightslevel.py @@ -0,0 +1,88 @@ +# -*- 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 'Text.rightslevel' + db.add_column('text_text', 'rightslevel', + self.gf('django.db.models.fields.IntegerField')(default=0, db_index=True), + keep_default=False) + + + def backwards(self, orm): + # Deleting field 'Text.rightslevel' + db.delete_column('text_text', 'rightslevel') + + + 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': '255'}), + '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': '255', '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': '255'}), + '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': '255'}) + }, + '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'}) + }, + 'text.position': { + 'Meta': {'unique_together': "(('user', 'text', 'section'),)", 'object_name': 'Position'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'position': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'section': ('django.db.models.fields.CharField', [], {'max_length': "'255'"}), + 'text': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'position'", 'to': "orm['text.Text']"}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'text_position'", 'to': "orm['auth.User']"}) + }, + 'text.text': { + 'Meta': {'unique_together': "(('user', 'name'),)", 'object_name': 'Text'}, + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'default': "''"}), + 'embeds': ('ox.django.fields.TupleField', [], {'default': '[]'}), + 'file': ('django.db.models.fields.files.FileField', [], {'default': 'None', 'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'icon': ('django.db.models.fields.files.ImageField', [], {'default': 'None', 'max_length': '100', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'poster_frames': ('ox.django.fields.TupleField', [], {'default': '[]'}), + 'rightslevel': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), + 'status': ('django.db.models.fields.CharField', [], {'default': "'private'", 'max_length': '20'}), + 'subscribed_users': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'subscribed_texts'", 'symmetrical': 'False', 'to': "orm['auth.User']"}), + 'text': ('django.db.models.fields.TextField', [], {'default': "''"}), + 'type': ('django.db.models.fields.CharField', [], {'default': "'html'", 'max_length': '255'}), + 'uploading': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'texts'", 'to': "orm['auth.User']"}) + } + } + + complete_apps = ['text'] \ No newline at end of file diff --git a/pandora/text/models.py b/pandora/text/models.py index 4024e3fc..23c24298 100644 --- a/pandora/text/models.py +++ b/pandora/text/models.py @@ -33,7 +33,7 @@ class Text(models.Model): _status = ['private', 'public', 'featured'] type = models.CharField(max_length=255, default='html') description = models.TextField(default='') - + rightslevel = models.IntegerField(db_index=True, default=0) icon = models.ImageField(default=None, blank=True, upload_to=lambda i, x: i.path("icon.jpg")) @@ -48,6 +48,7 @@ class Text(models.Model): file = models.FileField(default=None, blank=True,null=True, upload_to=lambda f, x: f.path(x)) def save(self, *args, **kwargs): + self.rightslevel = min(self.rightslevel, len(settings.CONFIG['textRightsLevels']) - 1) super(Text, self).save(*args, **kwargs) def __unicode__(self): @@ -130,6 +131,8 @@ class Text(models.Model): self.description = ox.sanitize_html(data['description']) elif key == 'text': self.text = ox.sanitize_html(data['text']) + elif key == 'rightslevel': + self.rightslevel = int(data['rightslevel']) if 'position' in data: pos, created = Position.objects.get_or_create(text=self, user=user)