Skip to content

Commit

Permalink
Merge branch 'hotfix/oberlin_references' into taggit
Browse files Browse the repository at this point in the history
  • Loading branch information
@melinath
melinath committed Jul 11, 2011
2 parents 949db68 + 2e6ad40 commit 5629695
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 26 deletions.
8 changes: 0 additions & 8 deletions philo/contrib/julian/migrations/0001_initial.py
View file
Expand Up @@ -219,14 +219,6 @@ def backwards(self, orm):
'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'})
},
'oberlin.locationcoordinates': {
'Meta': {'unique_together': "(('location_ct', 'location_pk'),)", 'object_name': 'LocationCoordinates'},
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'latitude': ('django.db.models.fields.FloatField', [], {}),
'location_ct': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
'location_pk': ('django.db.models.fields.TextField', [], {}),
'longitude': ('django.db.models.fields.FloatField', [], {})
},
'philo.attribute': {
'Meta': {'unique_together': "(('key', 'entity_content_type', 'entity_object_id'), ('value_content_type', 'value_object_id'))", 'object_name': 'Attribute'},
'entity_content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'attribute_entity_set'", 'to': "orm['contenttypes.ContentType']"}),
Expand Down
13 changes: 4 additions & 9 deletions ...migrations/0003_auto__add_field_newsletterview_feed_type__add_field_newsletterview_ite.py
View file
Expand Up @@ -3,6 +3,7 @@
from south.db import db
from south.v2 import SchemaMigration
from django.db import models
from philo.migrations import person_model, frozen_person

class Migration(SchemaMigration):

Expand Down Expand Up @@ -85,13 +86,7 @@ def backwards(self, orm):
'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
},
'oberlin.person': {
'Meta': {'object_name': 'Person'},
'bio': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '70', 'blank': 'True'}),
'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'null': 'True', 'blank': 'True'})
},
person_model: frozen_person,
'penfield.blog': {
'Meta': {'object_name': 'Blog'},
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
Expand All @@ -100,7 +95,7 @@ def backwards(self, orm):
},
'penfield.blogentry': {
'Meta': {'object_name': 'BlogEntry'},
'author': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'blogentries'", 'to': "orm['oberlin.Person']"}),
'author': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'blogentries'", 'to': "orm['%s']" % person_model}),
'blog': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'entries'", 'null': 'True', 'to': "orm['penfield.Blog']"}),
'content': ('django.db.models.fields.TextField', [], {}),
'date': ('django.db.models.fields.DateTimeField', [], {'default': 'None'}),
Expand Down Expand Up @@ -137,7 +132,7 @@ def backwards(self, orm):
},
'penfield.newsletterarticle': {
'Meta': {'unique_together': "(('newsletter', 'slug'),)", 'object_name': 'NewsletterArticle'},
'authors': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'newsletterarticles'", 'symmetrical': 'False', 'to': "orm['oberlin.Person']"}),
'authors': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'newsletterarticles'", 'symmetrical': 'False', 'to': "orm['%s']" % person_model}),
'date': ('django.db.models.fields.DateTimeField', [], {'default': 'None'}),
'full_text': ('philo.models.fields.TemplateField', [], {'db_index': 'True'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
Expand Down
13 changes: 4 additions & 9 deletions ...migrations/0004_auto__add_field_newsletterview_feed_length__add_field_blogview_feed_le.py
View file
Expand Up @@ -3,6 +3,7 @@
from south.db import db
from south.v2 import SchemaMigration
from django.db import models
from philo.migrations import person_model, frozen_person

class Migration(SchemaMigration):

Expand Down Expand Up @@ -61,13 +62,7 @@ def backwards(self, orm):
'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
},
'oberlin.person': {
'Meta': {'object_name': 'Person'},
'bio': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '70', 'blank': 'True'}),
'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'null': 'True', 'blank': 'True'})
},
person_model: frozen_person,
'penfield.blog': {
'Meta': {'object_name': 'Blog'},
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
Expand All @@ -76,7 +71,7 @@ def backwards(self, orm):
},
'penfield.blogentry': {
'Meta': {'object_name': 'BlogEntry'},
'author': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'blogentries'", 'to': "orm['oberlin.Person']"}),
'author': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'blogentries'", 'to': "orm['%s']" % person_model}),
'blog': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'entries'", 'null': 'True', 'to': "orm['penfield.Blog']"}),
'content': ('django.db.models.fields.TextField', [], {}),
'date': ('django.db.models.fields.DateTimeField', [], {'default': 'None'}),
Expand Down Expand Up @@ -114,7 +109,7 @@ def backwards(self, orm):
},
'penfield.newsletterarticle': {
'Meta': {'unique_together': "(('newsletter', 'slug'),)", 'object_name': 'NewsletterArticle'},
'authors': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'newsletterarticles'", 'symmetrical': 'False', 'to': "orm['oberlin.Person']"}),
'authors': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'newsletterarticles'", 'symmetrical': 'False', 'to': "orm['%s']" % person_model}),
'date': ('django.db.models.fields.DateTimeField', [], {'default': 'None'}),
'full_text': ('philo.models.fields.TemplateField', [], {'db_index': 'True'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
Expand Down

0 comments on commit 5629695

Please sign in to comment.