Filter action available and redirect properly

1 files changed, 7 insertions, 5 deletions

diff --git a/chimere/actions.py b/chimere/actions.py
index ac2bbaf..1fac738 100644
--- a/chimere/actions.py
+++ b/chimere/actions.py
@@ -36,18 +36,19 @@ class Action:
         try:
             self.url = reverse(
                 self.path,
-                args=[area_name if area_name else ''] + self.extra_url_args)
+                args=[area_name + '/' if area_name else '']
+                + self.extra_url_args)
         except NoReverseMatch:
             # backward url management
             self.url = reverse(
                 self.path,
-                args=[area_name + '/' if area_name else '']
-                + 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')),
-     (Action('edit', 'chimere:edit', _('Add a new point of interest')),
+     (Action('edit-marker', 'chimere:editmarker',
+      _('Add a new point of interest')),
       Action('edit-route', 'chimere:editroute', _('Add a new route')),
       Action('edit-polygon', 'chimere:editpolygon', _('Add a new polygon'))),
      )]
@@ -82,7 +83,8 @@ def actions(area_name=''):
         real_childs = []
         for child_act in childs:
             if area:
-                if (child_act.id == 'edit' and not area.allow_point_edition) \
+                if (child_act.id == 'edit-marker'
+                    and not area.allow_point_edition) \
                     or (child_act.id == 'edit-route'
                         and not area.allow_route_edition) \
                     or (child_act.id == 'edit-polygon'