Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '1468_newsletter_unsubscribe_subscribe'
- Loading branch information
Showing
17 changed files
with
603 additions
and
104 deletions.
There are no files selected for viewing
153 changes: 153 additions & 0 deletions
153
...migrations/0009_auto__add_field_groupmembership_is_newsletter_subscribed__add_field_gr.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,153 @@ | ||
| # -*- 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 'GroupMembership.is_newsletter_subscribed' | ||
| db.add_column('user_groups_groupmembership', 'is_newsletter_subscribed', | ||
| self.gf('django.db.models.fields.BooleanField')(default=True), | ||
| keep_default=False) | ||
|
|
||
| # Adding field 'GroupMembership.newsletter_key' | ||
| db.add_column('user_groups_groupmembership', 'newsletter_key', | ||
| self.gf('django.db.models.fields.CharField')(max_length=50, null=True, blank=True), | ||
| keep_default=False) | ||
|
|
||
|
|
||
| def backwards(self, orm): | ||
| # Deleting field 'GroupMembership.is_newsletter_subscribed' | ||
| db.delete_column('user_groups_groupmembership', 'is_newsletter_subscribed') | ||
|
|
||
| # Deleting field 'GroupMembership.newsletter_key' | ||
| db.delete_column('user_groups_groupmembership', 'newsletter_key') | ||
|
|
||
|
|
||
| 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'}) | ||
| }, | ||
| 'entities.entity': { | ||
| 'Meta': {'ordering': "('entity_name',)", 'object_name': 'Entity'}, | ||
| 'admin_notes': ('django.db.models.fields.TextField', [], {'blank': 'True'}), | ||
| 'allow_anonymous_edit': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 'allow_anonymous_view': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
| 'allow_member_edit': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 'allow_member_view': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 'allow_user_edit': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 'allow_user_view': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 'contact_name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}), | ||
| 'create_dt': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), | ||
| 'creator': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'entity_creator'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), | ||
| 'creator_username': ('django.db.models.fields.CharField', [], {'max_length': '50'}), | ||
| 'email': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}), | ||
| 'entity_name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}), | ||
| 'entity_parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'entity_children'", 'null': 'True', 'to': "orm['entities.Entity']"}), | ||
| 'entity_type': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}), | ||
| 'fax': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}), | ||
| 'guid': ('django.db.models.fields.CharField', [], {'max_length': '40'}), | ||
| 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'notes': ('django.db.models.fields.TextField', [], {'blank': 'True'}), | ||
| 'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'entity_owner'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), | ||
| 'owner_username': ('django.db.models.fields.CharField', [], {'max_length': '50'}), | ||
| 'phone': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}), | ||
| 'status': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
| 'status_detail': ('django.db.models.fields.CharField', [], {'default': "'active'", 'max_length': '50'}), | ||
| 'summary': ('django.db.models.fields.TextField', [], {'blank': 'True'}), | ||
| 'update_dt': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), | ||
| 'website': ('django.db.models.fields.CharField', [], {'max_length': '300', 'blank': 'True'}) | ||
| }, | ||
| 'user_groups.group': { | ||
| 'Meta': {'ordering': "('name',)", 'object_name': 'Group'}, | ||
| 'allow_anonymous_view': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
| 'allow_member_edit': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 'allow_member_view': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 'allow_self_add': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
| 'allow_self_remove': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
| 'allow_user_edit': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 'allow_user_view': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 'auto_respond': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 'auto_respond_priority': ('django.db.models.fields.FloatField', [], {'default': '0', 'blank': 'True'}), | ||
| 'create_dt': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), | ||
| 'creator': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'user_groups_group_creator'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), | ||
| 'creator_username': ('django.db.models.fields.CharField', [], {'max_length': '50'}), | ||
| 'dashboard_url': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), | ||
| 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), | ||
| 'email_recipient': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), | ||
| 'entity': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'user_groups_group_entity'", 'on_delete': 'models.SET_NULL', 'default': 'None', 'to': "orm['entities.Entity']", 'blank': 'True', 'null': 'True'}), | ||
| 'group': ('django.db.models.fields.related.OneToOneField', [], {'default': 'None', 'to': "orm['auth.Group']", 'unique': 'True', 'null': 'True'}), | ||
| 'guid': ('django.db.models.fields.CharField', [], {'max_length': '40'}), | ||
| 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'label': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), | ||
| 'members': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.User']", 'through': "orm['user_groups.GroupMembership']", 'symmetrical': 'False'}), | ||
| 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), | ||
| 'notes': ('django.db.models.fields.TextField', [], {'blank': 'True'}), | ||
| 'owner': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'user_groups_group_owner'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), | ||
| 'owner_username': ('django.db.models.fields.CharField', [], {'max_length': '50'}), | ||
| 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'group_permissions'", 'blank': 'True', 'to': "orm['auth.Permission']"}), | ||
| 'show_as_option': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
| 'slug': ('tendenci.core.base.fields.SlugField', [], {'unique': 'True', 'max_length': '100', 'db_index': 'True'}), | ||
| 'status': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
| 'status_detail': ('django.db.models.fields.CharField', [], {'default': "'active'", 'max_length': '50'}), | ||
| 'sync_newsletters': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
| 'type': ('django.db.models.fields.CharField', [], {'default': "'distribution'", 'max_length': '75', 'blank': 'True'}), | ||
| 'update_dt': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}) | ||
| }, | ||
| 'user_groups.groupmembership': { | ||
| 'Meta': {'unique_together': "(('group', 'member'),)", 'object_name': 'GroupMembership'}, | ||
| 'create_dt': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), | ||
| 'creator_id': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
| 'creator_username': ('django.db.models.fields.CharField', [], {'max_length': '50'}), | ||
| 'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['user_groups.Group']"}), | ||
| 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'is_newsletter_subscribed': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
| 'member': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'group_member'", 'to': "orm['auth.User']"}), | ||
| 'newsletter_key': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
| 'owner_id': ('django.db.models.fields.IntegerField', [], {'default': '0'}), | ||
| 'owner_username': ('django.db.models.fields.CharField', [], {'max_length': '50'}), | ||
| 'role': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), | ||
| 'sort_order': ('django.db.models.fields.IntegerField', [], {'default': '0', 'blank': 'True'}), | ||
| 'status': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
| 'status_detail': ('django.db.models.fields.CharField', [], {'default': "'active'", 'max_length': '50'}), | ||
| 'update_dt': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}) | ||
| } | ||
| } | ||
|
|
||
| complete_apps = ['user_groups'] |
Oops, something went wrong.