diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-11-19 01:16:54 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-11-19 01:16:54 +0100 |
| commit | ecb0db44ce3d03885c1a75acf15d58b27f16a6ed (patch) | |
| tree | afe4f90422e56a1e025781eb3c1a44511a1bc2cb /chimere | |
| parent | ded35ffba989c28d8dd515fc9c0f4e241038d668 (diff) | |
| download | Chimère-ecb0db44ce3d03885c1a75acf15d58b27f16a6ed.tar.bz2 Chimère-ecb0db44ce3d03885c1a75acf15d58b27f16a6ed.zip | |
Fix merge errors
Diffstat (limited to 'chimere')
| -rw-r--r-- | chimere/actions.py | 2 | ||||
| -rw-r--r-- | chimere/migrations/0048_auto__add_unique_area_order__add_field_importer_associate_marker_to_wa.py (renamed from chimere/migrations/0037_auto__add_unique_area_order__add_field_importer_associate_marker_to_wa.py) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/chimere/actions.py b/chimere/actions.py index a434279..8ef5338 100644 --- a/chimere/actions.py +++ b/chimere/actions.py @@ -34,7 +34,7 @@ class Action: def update_url(self, area_name): self.url = reverse(self.path, - args=[area_name+'/'] + self.extra_url_args) + args=[area_name + '/' if area_name else ''] + self.extra_url_args) default_actions = [(Action('view', 'chimere:index', _('View')), []), (Action('contribute', 'chimere:edit', _('Contribute')), diff --git a/chimere/migrations/0037_auto__add_unique_area_order__add_field_importer_associate_marker_to_wa.py b/chimere/migrations/0048_auto__add_unique_area_order__add_field_importer_associate_marker_to_wa.py index 4b40fb9..4b40fb9 100644 --- a/chimere/migrations/0037_auto__add_unique_area_order__add_field_importer_associate_marker_to_wa.py +++ b/chimere/migrations/0048_auto__add_unique_area_order__add_field_importer_associate_marker_to_wa.py |