summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ishtar_common/admin.py10
-rw-r--r--ishtar_common/migrations/0042_remove_persontype_groups.py19
-rw-r--r--ishtar_common/models.py4
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")