rename calendars urls

tracim/tracim/lib/calendar.py

@@ -18,8 +18,8 @@ from tracim.model.organizational import Calendar
 from tracim.model.organizational import UserCalendar
 from tracim.model.organizational import WorkspaceCalendar
 
-CALENDAR_USER_PATH_RE = 'user\/([0-9]+)--([a-z-]*).ics'
-CALENDAR_WORKSPACE_PATH_RE = 'workspace\/([0-9]+)--([a-z0-9-]*).ics'
+CALENDAR_USER_PATH_RE = 'user\/([0-9]+).ics'
+CALENDAR_WORKSPACE_PATH_RE = 'workspace\/([0-9]+).ics'
 
 CALENDAR_TYPE_USER = UserCalendar
 CALENDAR_TYPE_WORKSPACE = WorkspaceCalendar

tracim/tracim/model/auth.py

@@ -155,7 +155,7 @@ class User(DeclarativeBase):
         # TODO - 20160531 - Bastien: Cyclic import if import in top of file
         from tracim.config.app_cfg import CFG
         cfg = CFG.get_instance()
-        return '{proto}://{domain}:{port}/user/{id}--{slug_name}.ics'.format(
+        return '{proto}://{domain}:{port}/user/{id}.ics#{slug_name}'.format(
             proto='https' if cfg.RADICALE_CLIENT_SSL else 'http',
             domain=cfg.RADICALE_CLIENT_HOST or request.domain,
             port=cfg.RADICALE_CLIENT_PORT,

tracim/tracim/model/data.py

@@ -72,7 +72,7 @@ class Workspace(DeclarativeBase):
         # TODO - 20160531 - Bastien: Cyclic import if import in top of file
         from tracim.config.app_cfg import CFG
         cfg = CFG.get_instance()
-        return '{proto}://{domain}:{port}/workspace/{id}--{slug}.ics'.format(
+        return '{proto}://{domain}:{port}/workspace/{id}.ics#{slug}'.format(
             proto='https' if cfg.RADICALE_CLIENT_SSL else 'http',
             domain=cfg.RADICALE_CLIENT_HOST or tg.request.domain,
             port=cfg.RADICALE_CLIENT_PORT,