diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-04 21:44:27 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-04 21:44:27 +0100 |
| commit | cb11379a0928b99e7801710040ac90dd1665b5ef (patch) | |
| tree | 9f64e921fc66bbe0938e17c1f5325b83c4ccb73b /ishtar_common/admin.py | |
| parent | e62d26f17f7f0da10d7bf0f9c7d8895c88002021 (diff) | |
| parent | 0b0a146fbacde80528b7fb12bfe5719fdef40c85 (diff) | |
| download | Ishtar-cb11379a0928b99e7801710040ac90dd1665b5ef.tar.bz2 Ishtar-cb11379a0928b99e7801710040ac90dd1665b5ef.zip | |
Merge branch 'master' into master-importers
Conflicts:
ishtar_common/fixtures/initial_importtypes-fr.json
Diffstat (limited to 'ishtar_common/admin.py')
| -rw-r--r-- | ishtar_common/admin.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py index 219a6adeb..bcc0560b6 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',) actions = ['import_generic', export_as_csv_action()] import_generic = gen_import_generic |