diff options
| -rw-r--r-- | ishtar_common/admin.py | 2 | ||||
| -rw-r--r-- | ishtar_common/forms_common.py | 5 | ||||
| -rw-r--r-- | ishtar_common/migrations/0013_importertype_available.py | 20 | ||||
| -rw-r--r-- | ishtar_common/models_imports.py | 1 |
4 files changed, 27 insertions, 1 deletions
diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py index 2adbebd3d..4888f9b15 100644 --- a/ishtar_common/admin.py +++ b/ishtar_common/admin.py @@ -244,7 +244,7 @@ admin_site.register(models.ImporterDefault, ImporterDefaultAdmin) class ImporterTypeAdmin(admin.ModelAdmin): - list_display = ('name', 'associated_models', 'is_template') + list_display = ('name', 'associated_models', 'available') admin_site.register(models.ImporterType, ImporterTypeAdmin) diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py index 42e390925..116c8c277 100644 --- a/ishtar_common/forms_common.py +++ b/ishtar_common/forms_common.py @@ -123,6 +123,11 @@ class NewImportForm(forms.ModelForm): else: self.fields['associated_group'].choices = [(None, '--')] + \ [(g.pk, unicode(g)) for g in groups.all()] + self.fields['importer_type'].choices = [('', '--')] + [ + (imp.pk, imp.name) for imp in models.ImporterType.objects.filter( + available=True + ) + ] def clean(self): data = self.cleaned_data diff --git a/ishtar_common/migrations/0013_importertype_available.py b/ishtar_common/migrations/0013_importertype_available.py new file mode 100644 index 000000000..91a90ba30 --- /dev/null +++ b/ishtar_common/migrations/0013_importertype_available.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11 on 2017-09-26 16:22 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ishtar_common', '0012_auto_20170926_1048'), + ] + + operations = [ + migrations.AddField( + model_name='importertype', + name='available', + field=models.BooleanField(default=True, verbose_name='Available'), + ), + ] diff --git a/ishtar_common/models_imports.py b/ishtar_common/models_imports.py index b8a7d683e..d6106f33b 100644 --- a/ishtar_common/models_imports.py +++ b/ishtar_common/models_imports.py @@ -126,6 +126,7 @@ class ImporterType(models.Model): is_template = models.BooleanField(_(u"Is template"), default=False) unicity_keys = models.CharField(_(u"Unicity keys (separator \";\")"), blank=True, null=True, max_length=500) + available = models.BooleanField(_(u"Available"), default=True) objects = ImporterTypeManager() class Meta: |