Admin: improve importer column form

2 files changed, 13 insertions, 1 deletions

diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py
index e2ecbf839..3460c4a75 100644
--- a/ishtar_common/admin.py
+++ b/ishtar_common/admin.py
@@ -238,15 +238,26 @@ class ImporterDuplicateFieldInline(admin.TabularInline):
     model = models.ImporterDuplicateField
 
 
+class ImportTargetForm(forms.ModelForm):
+    class Meta:
+        model = models.ImportTarget
+        exclude = []
+        widgets = {
+            'comment': forms.TextInput
+        }
+
+
 class ImportTargetInline(admin.TabularInline):
     model = models.ImportTarget
+    extra = 1
+    form = ImportTargetForm
 
 
 class ImporterColumnAdmin(admin.ModelAdmin):
     list_display = ('label', 'importer_type', 'col_number', 'description',
                     'targets_lbl', 'duplicate_fields_lbl', 'required')
     list_filter = ('importer_type',)
-    inlines = (ImporterDuplicateFieldInline, ImportTargetInline)
+    inlines = (ImportTargetInline, ImporterDuplicateFieldInline)
 admin.site.register(models.ImporterColumn, ImporterColumnAdmin)
 
 
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index c9903525d..90e2bd6f6 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -1777,6 +1777,7 @@ class ImporterType(models.Model):
     class Meta:
         verbose_name = _(u"Importer - Type")
         verbose_name_plural = _(u"Importer - Types")
+        ordering = ('name',)
 
     def __unicode__(self):
         return self.name