summaryrefslogtreecommitdiff
path: root/ishtar_common
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@proxience.com>2014-05-10 20:05:08 +0200
committerÉtienne Loks <etienne.loks@proxience.com>2014-05-10 20:05:08 +0200
commita66491533627ec4911fe7b466f174a5f704291e5 (patch)
tree6ec26ee9425c2691c2faa7678da7f65f9e82193b /ishtar_common
parente706b4cb2a2a42e32f6572146862870d1ae54f1c (diff)
downloadIshtar-a66491533627ec4911fe7b466f174a5f704291e5.tar.bz2
Ishtar-a66491533627ec4911fe7b466f174a5f704291e5.zip
Manage operation type order (refs #1685)
Diffstat (limited to 'ishtar_common')
-rw-r--r--ishtar_common/admin.py4
-rw-r--r--ishtar_common/models.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py
index 320136aec..cfbed2f66 100644
--- a/ishtar_common/admin.py
+++ b/ishtar_common/admin.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet>
+# Copyright (C) 2010-2014 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet>
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
@@ -82,7 +82,7 @@ class PersonTypeAdmin(admin.ModelAdmin):
admin.site.register(models.PersonType, PersonTypeAdmin)
class GeneralTypeAdmin(admin.ModelAdmin):
- list_display = ('label', 'txt_idx', 'available')
+ list_display = ['label', 'txt_idx', 'available']
general_models = [models.OrganizationType, models.SourceType, models.AuthorType]
for model in general_models:
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index 4f64d6f8f..1ff809315 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -673,7 +673,7 @@ class DocumentTemplate(models.Model):
def get_tuples(cls, dct={}, empty_first=True):
dct['available'] = True
if empty_first:
- yield ('', '--')
+ yield ('', '----------')
items = cls.objects.filter(**dct)
for item in items.order_by(*cls._meta.ordering).all():
yield (item.pk, _(unicode(item)))