Merge branch 'v0.9' into wheezy

1 files changed, 8 insertions, 0 deletions

diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py
index 7b671caae..e2ecbf839 100644
--- a/ishtar_common/admin.py
+++ b/ishtar_common/admin.py
@@ -201,6 +201,7 @@ admin.site.register(models.GlobalVar, GlobalVarAdmin)
 
 class GeneralTypeAdmin(admin.ModelAdmin):
     list_display = ['label', 'txt_idx', 'available', 'comment']
+    search_fields = ('label', 'txt_idx', 'comment',)
     actions = ['import_generic', export_as_csv_action()]
     import_generic = gen_import_generic
 
@@ -249,6 +250,13 @@ class ImporterColumnAdmin(admin.ModelAdmin):
 admin.site.register(models.ImporterColumn, ImporterColumnAdmin)
 
 
+class ImporterModelAdmin(admin.ModelAdmin):
+    list_display = ('name', 'klass')
+    model = models.ImporterModel
+
+admin.site.register(models.ImporterModel, ImporterModelAdmin)
+
+
 class FormaterTypeAdmin(admin.ModelAdmin):
     list_display = ('formater_type', 'options')
 admin.site.register(models.FormaterType, FormaterTypeAdmin)