diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-09-19 00:33:42 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-09-19 00:33:42 +0200 |
| commit | d131943b9fad88c1753a22561c024d72515ad9de (patch) | |
| tree | d68e1baed6a186a9eac090948a5b9b6518e83637 /chimere/utils.py | |
| parent | f05839ea95da54cd09e7c6f47775e27649c6ca0a (diff) | |
| parent | ffd7d81bbbaa9fc7684d55fce32bff46fcf7df7b (diff) | |
| download | Chimère-d131943b9fad88c1753a22561c024d72515ad9de.tar.bz2 Chimère-d131943b9fad88c1753a22561c024d72515ad9de.zip | |
Merge branch 'master' into saclay
Diffstat (limited to 'chimere/utils.py')
| -rw-r--r-- | chimere/utils.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chimere/utils.py b/chimere/utils.py index a24e22f..556b51b 100644 --- a/chimere/utils.py +++ b/chimere/utils.py @@ -56,8 +56,12 @@ class ImportManager: default_source = None def __init__(self, importer_instance): self.importer_instance = importer_instance - self.default_name = " - ".join([cat.name - for cat in self.importer_instance.categories.order_by('name').all()]) + if self.importer_instance.default_name: + self.default_name = self.importer_instance.default_name + else: + self.default_name = " - ".join([cat.name + for cat in self.importer_instance.categories.order_by( + 'name').all()]) def get(self): pass |