diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-08-13 09:14:11 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-08-13 09:14:11 +0200 |
| commit | c5e801a916e09e1778c99d3b005414f5c124a9aa (patch) | |
| tree | bc47fa2a01a3dc2c85b819fd536eafd0cc4f8a26 | |
| parent | a712f5ddc3e3520cbe3076fec45205c47145c94f (diff) | |
| download | Ishtar-c5e801a916e09e1778c99d3b005414f5c124a9aa.tar.bz2 Ishtar-c5e801a916e09e1778c99d3b005414f5c124a9aa.zip | |
Models: change relation type to manage self relation on virtual class
| -rw-r--r-- | Makefile.example | 2 | ||||
| -rw-r--r-- | archaeological_context_records/models.py | 4 | ||||
| -rw-r--r-- | archaeological_operations/models.py | 3 | ||||
| -rw-r--r-- | ishtar_common/models.py | 7 |
4 files changed, 4 insertions, 12 deletions
diff --git a/Makefile.example b/Makefile.example index 7a93e66da..2529c56f4 100644 --- a/Makefile.example +++ b/Makefile.example @@ -64,7 +64,7 @@ pylint: pylint "$(CURDIR)/$$DIR" --ignore=.git,migrations --max-public-methods=50 --ignored-classes=Item.Meta --method-rgx='[a-z_][a-z0-9_]{2,40}$$'; \ done -syncdb: +migrate: cd $(project); $(PYTHON) manage.py migrate shell: diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index f968c1d6e..fe9f8a2bc 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -536,10 +536,6 @@ post_save.connect(cached_label_changed, sender=ContextRecord) class RelationType(GeneralRelationType): - inverse_relation = models.ForeignKey( - 'RelationType', verbose_name=_(u"Inverse relation"), blank=True, - null=True) - class Meta: verbose_name = _(u"Relation type") verbose_name_plural = _(u"Relation types") diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index ba947e8bb..5a90ccac5 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -816,9 +816,6 @@ post_save.connect(operation_post_save, sender=Operation) class RelationType(GeneralRelationType): - inverse_relation = models.ForeignKey( - 'RelationType', verbose_name=_(u"Inverse relation"), blank=True, - null=True) class Meta: verbose_name = _(u"Operation relation type") diff --git a/ishtar_common/models.py b/ishtar_common/models.py index b3fba3b1f..c2f75aba3 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -1066,10 +1066,9 @@ class GeneralRelationType(GeneralType): symmetrical = models.BooleanField(_(u"Symmetrical")) tiny_label = models.CharField(_(u"Tiny label"), max_length=50, blank=True, null=True) - # # an inverse must be set - # inverse_relation = models.ForeignKey( - # 'RelationType', verbose_name=_(u"Inverse relation"), blank=True, - # null=True) + inverse_relation = models.ForeignKey( + 'self', verbose_name=_(u"Inverse relation"), blank=True, + null=True) class Meta: abstract = True |