浏览代码

rename calendars urls

Bastien Sevajol (Algoo) 9 年前
父节点
当前提交
7b51f6733e
共有 3 个文件被更改,包括 4 次插入4 次删除
  1. 2 2
      tracim/tracim/lib/calendar.py
  2. 1 1
      tracim/tracim/model/auth.py
  3. 1 1
      tracim/tracim/model/data.py

+ 2 - 2
tracim/tracim/lib/calendar.py 查看文件

18
 from tracim.model.organizational import UserCalendar
18
 from tracim.model.organizational import UserCalendar
19
 from tracim.model.organizational import WorkspaceCalendar
19
 from tracim.model.organizational import WorkspaceCalendar
20
 
20
 
21
-CALENDAR_USER_PATH_RE = 'user\/([0-9]+)--([a-z-]*).ics'
22
-CALENDAR_WORKSPACE_PATH_RE = 'workspace\/([0-9]+)--([a-z0-9-]*).ics'
21
+CALENDAR_USER_PATH_RE = 'user\/([0-9]+).ics'
22
+CALENDAR_WORKSPACE_PATH_RE = 'workspace\/([0-9]+).ics'
23
 
23
 
24
 CALENDAR_TYPE_USER = UserCalendar
24
 CALENDAR_TYPE_USER = UserCalendar
25
 CALENDAR_TYPE_WORKSPACE = WorkspaceCalendar
25
 CALENDAR_TYPE_WORKSPACE = WorkspaceCalendar

+ 1 - 1
tracim/tracim/model/auth.py 查看文件

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

+ 1 - 1
tracim/tracim/model/data.py 查看文件

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