From 905350207465c59cb473146f7a408f248f58e953 Mon Sep 17 00:00:00 2001 From: Emilie Date: Wed, 14 Sep 2016 14:57:22 +0200 Subject: [PATCH] Person - Organization : renaming fk key --- .../migrations/0006_auto_20160914_1454.py | 65 +++++++++++++++++++ app/organization/network/models.py | 26 +++++--- 2 files changed, 81 insertions(+), 10 deletions(-) create mode 100644 app/organization/network/migrations/0006_auto_20160914_1454.py diff --git a/app/organization/network/migrations/0006_auto_20160914_1454.py b/app/organization/network/migrations/0006_auto_20160914_1454.py new file mode 100644 index 00000000..fd60b01c --- /dev/null +++ b/app/organization/network/migrations/0006_auto_20160914_1454.py @@ -0,0 +1,65 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-09-14 12:54 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('organization-network', '0005_auto_20160905_1853'), + ] + + operations = [ + migrations.RenameField( + model_name='organizationaudio', + old_name='project', + new_name='organization', + ), + migrations.RenameField( + model_name='organizationblock', + old_name='project', + new_name='organization', + ), + migrations.RenameField( + model_name='organizationimage', + old_name='project', + new_name='organization', + ), + migrations.RenameField( + model_name='organizationlink', + old_name='project', + new_name='organization', + ), + migrations.RenameField( + model_name='organizationvideo', + old_name='project', + new_name='organization', + ), + migrations.RenameField( + model_name='personaudio', + old_name='project', + new_name='person', + ), + migrations.RenameField( + model_name='personblock', + old_name='project', + new_name='person', + ), + migrations.RenameField( + model_name='personimage', + old_name='project', + new_name='person', + ), + migrations.RenameField( + model_name='personlink', + old_name='project', + new_name='person', + ), + migrations.RenameField( + model_name='personvideo', + old_name='project', + new_name='person', + ), + ] diff --git a/app/organization/network/models.py b/app/organization/network/models.py index 7206ec98..b402ee22 100644 --- a/app/organization/network/models.py +++ b/app/organization/network/models.py @@ -77,27 +77,27 @@ class Organization(Named, Address, URL): class OrganizationAudio(Audio): - project = models.ForeignKey(Organization, verbose_name=_('project'), related_name='audios', blank=True, null=True, on_delete=models.SET_NULL) + organization = models.ForeignKey(Organization, verbose_name=_('project'), related_name='audios', blank=True, null=True, on_delete=models.SET_NULL) class OrganizationVideo(Video): - project = models.ForeignKey(Organization, verbose_name=_('project'), related_name='videos', blank=True, null=True, on_delete=models.SET_NULL) + organization = models.ForeignKey(Organization, verbose_name=_('project'), related_name='videos', blank=True, null=True, on_delete=models.SET_NULL) class OrganizationLink(Link): - project = models.ForeignKey(Organization, verbose_name=_('project'), related_name='links', blank=True, null=True, on_delete=models.SET_NULL) + organization = models.ForeignKey(Organization, verbose_name=_('project'), related_name='links', blank=True, null=True, on_delete=models.SET_NULL) class OrganizationImage(Image): - project = models.ForeignKey(Organization, verbose_name=_('project'), related_name='images', blank=True, null=True, on_delete=models.SET_NULL) + organization = models.ForeignKey(Organization, verbose_name=_('project'), related_name='images', blank=True, null=True, on_delete=models.SET_NULL) class OrganizationBlock(Block): - project = models.ForeignKey(Organization, verbose_name=_('project'), related_name='blocks', blank=True, null=True, on_delete=models.SET_NULL) + organization = models.ForeignKey(Organization, verbose_name=_('project'), related_name='blocks', blank=True, null=True, on_delete=models.SET_NULL) class OrganizationType(Named): @@ -204,27 +204,33 @@ class Person(Displayable, AdminThumbMixin): class PersonAudio(Audio): - project = models.ForeignKey(Person, verbose_name=_('project'), related_name='audios', blank=True, null=True, on_delete=models.SET_NULL) + person = models.ForeignKey(Person, verbose_name=_('project'), related_name='audios', blank=True, null=True, on_delete=models.SET_NULL) class PersonVideo(Video): - project = models.ForeignKey(Person, verbose_name=_('project'), related_name='videos', blank=True, null=True, on_delete=models.SET_NULL) + person = models.ForeignKey(Person, verbose_name=_('project'), related_name='videos', blank=True, null=True, on_delete=models.SET_NULL) class PersonLink(Link): - project = models.ForeignKey(Person, verbose_name=_('project'), related_name='links', blank=True, null=True, on_delete=models.SET_NULL) + person = models.ForeignKey(Person, verbose_name=_('project'), related_name='links', blank=True, null=True, on_delete=models.SET_NULL) class PersonImage(Image): - project = models.ForeignKey(Person, verbose_name=_('project'), related_name='images', blank=True, null=True, on_delete=models.SET_NULL) + person = models.ForeignKey(Person, verbose_name=_('project'), related_name='images', blank=True, null=True, on_delete=models.SET_NULL) class PersonBlock(Block): - project = models.ForeignKey(Person, verbose_name=_('project'), related_name='blocks', blank=True, null=True, on_delete=models.SET_NULL) + person = models.ForeignKey(Person, verbose_name=_('project'), related_name='blocks', blank=True, null=True, on_delete=models.SET_NULL) + + +# class PersonListBlock(Titled): +# +# class Meta: +# verbose_name = _('Person List') class ActivityStatus(Named): -- 2.39.5