diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-01-23 21:33:58 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-01-23 21:33:58 +0100 |
| commit | db96123a9df3bf7cfb11b8dda3f61454651ae6df (patch) | |
| tree | a3d211ffc4993fef1c69e981c501a6aece9ed6b3 | |
| parent | 93a9a0b569c9d92a0a9df3becbe39dc10a566cb6 (diff) | |
| download | Chimère-db96123a9df3bf7cfb11b8dda3f61454651ae6df.tar.bz2 Chimère-db96123a9df3bf7cfb11b8dda3f61454651ae6df.zip | |
Merge migrations from v2.2
| -rw-r--r-- | chimere/migrations/0017_auto__add_subcategoryuserlimit.py (renamed from chimere/migrations/0015_auto__add_subcategoryuserlimit.py) | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/chimere/migrations/0015_auto__add_subcategoryuserlimit.py b/chimere/migrations/0017_auto__add_subcategoryuserlimit.py index e24663a..9ae257c 100644 --- a/chimere/migrations/0015_auto__add_subcategoryuserlimit.py +++ b/chimere/migrations/0017_auto__add_subcategoryuserlimit.py @@ -11,8 +11,8 @@ class Migration(SchemaMigration): # Adding model 'SubCategoryUserLimit' db.create_table('chimere_subcategoryuserlimit', ( ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('subcategory', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['chimere.SubCategory'])), - ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])), + ('subcategory', self.gf('django.db.models.fields.related.ForeignKey')(related_name='limited_for_user', to=orm['chimere.SubCategory'])), + ('user', self.gf('django.db.models.fields.related.ForeignKey')(related_name='subcategory_limit_to', to=orm['auth.User'])), )) db.send_create_signal('chimere', ['SubCategoryUserLimit']) @@ -111,6 +111,10 @@ class Migration(SchemaMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}), + 'offset_x': ('django.db.models.fields.IntegerField', [], {'default': '10'}), + 'offset_y': ('django.db.models.fields.IntegerField', [], {'default': '20'}), + 'popup_offset_x': ('django.db.models.fields.IntegerField', [], {'default': '5'}), + 'popup_offset_y': ('django.db.models.fields.IntegerField', [], {'default': '20'}), 'width': ('django.db.models.fields.IntegerField', [], {}) }, 'chimere.importer': { @@ -317,8 +321,8 @@ class Migration(SchemaMigration): 'chimere.subcategoryuserlimit': { 'Meta': {'object_name': 'SubCategoryUserLimit'}, 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'subcategory': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.SubCategory']"}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + 'subcategory': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'limited_for_user'", 'to': "orm['chimere.SubCategory']"}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'subcategory_limit_to'", 'to': "orm['auth.User']"}) }, 'chimere.tinyurl': { 'Meta': {'object_name': 'TinyUrl'}, |