diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-04-10 18:15:11 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-06-12 08:39:42 +0200 |
commit | 832b1876bc12ab6dda1224bf680e3fa3a0c39295 (patch) | |
tree | 4fceabe9c28aa2360353aa9296b730acfbf3067b /ishtar_common | |
parent | 686034131ceb73188bce9cfd668999a5c801e337 (diff) | |
download | Ishtar-832b1876bc12ab6dda1224bf680e3fa3a0c39295.tar.bz2 Ishtar-832b1876bc12ab6dda1224bf680e3fa3a0c39295.zip |
Remove groups from person types (refs #4046)
Diffstat (limited to 'ishtar_common')
-rw-r--r-- | ishtar_common/admin.py | 10 | ||||
-rw-r--r-- | ishtar_common/migrations/0042_remove_persontype_groups.py | 19 | ||||
-rw-r--r-- | ishtar_common/models.py | 4 |
3 files changed, 20 insertions, 13 deletions
diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py index 3008f55ce..73f985245 100644 --- a/ishtar_common/admin.py +++ b/ishtar_common/admin.py @@ -450,19 +450,11 @@ class GeneralTypeAdmin(admin.ModelAdmin): general_models = [models.OrganizationType, models.SourceType, models.AuthorType, models.TitleType, models.Format, - models.SupportType] + models.SupportType, models.PersonType] for model in general_models: admin_site.register(model, GeneralTypeAdmin) -class PersonTypeAdmin(GeneralTypeAdmin): - model = models.PersonType - filter_vertical = ('groups',) - - -admin_site.register(models.PersonType, PersonTypeAdmin) - - class ProfileTypeAdmin(GeneralTypeAdmin): model = models.ProfileType filter_vertical = ('groups',) diff --git a/ishtar_common/migrations/0042_remove_persontype_groups.py b/ishtar_common/migrations/0042_remove_persontype_groups.py new file mode 100644 index 000000000..8be0539ad --- /dev/null +++ b/ishtar_common/migrations/0042_remove_persontype_groups.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2018-04-10 18:14 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('ishtar_common', '0041_auto_20180409_1901'), + ] + + operations = [ + migrations.RemoveField( + model_name='persontype', + name='groups', + ), + ] diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 3eceb8df0..24b16c873 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -2373,10 +2373,6 @@ class Organization(Address, Merge, OwnPerms, ValueGetter): class PersonType(GeneralType): - # rights = models.ManyToManyField(WizardStep, verbose_name=_(u"Rights")) - groups = models.ManyToManyField(Group, verbose_name=_(u"Groups"), - blank=True) - class Meta: verbose_name = _(u"Person type") verbose_name_plural = _(u"Person types") |