瀏覽代碼

Calendar URLs in constants

Bastien Sevajol (Algoo) 9 年之前
父節點
當前提交
b5d5356d64
共有 3 個文件被更改,包括 10 次插入5 次删除
  1. 5 0
      tracim/tracim/lib/calendar.py
  2. 3 4
      tracim/tracim/model/auth.py
  3. 2 1
      tracim/tracim/model/data.py

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

24
 CALENDAR_TYPE_USER = UserCalendar
24
 CALENDAR_TYPE_USER = UserCalendar
25
 CALENDAR_TYPE_WORKSPACE = WorkspaceCalendar
25
 CALENDAR_TYPE_WORKSPACE = WorkspaceCalendar
26
 
26
 
27
+CALENDAR_USER_URL_TEMPLATE = \
28
+    '{proto}://{domain}:{port}/user/{id}.ics#{slug}'
29
+CALENDAR_WORKSPACE_URL_TEMPLATE = \
30
+    '{proto}://{domain}:{port}/workspace/{id}.ics#{slug}'
31
+
27
 
32
 
28
 class CalendarManager(object):
33
 class CalendarManager(object):
29
     def __init__(self, user: User):
34
     def __init__(self, user: User):

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

28
 from sqlalchemy.types import Boolean
28
 from sqlalchemy.types import Boolean
29
 from sqlalchemy.orm import relation, relationship, synonym
29
 from sqlalchemy.orm import relation, relationship, synonym
30
 from tg import request
30
 from tg import request
31
-from tg import config
32
-
31
+from tracim.lib.calendar import CALENDAR_USER_URL_TEMPLATE
33
 from tracim.model import DeclarativeBase, metadata, DBSession
32
 from tracim.model import DeclarativeBase, metadata, DBSession
34
 
33
 
35
 # This is the association table for the many-to-many relationship between
34
 # This is the association table for the many-to-many relationship between
155
         # TODO - 20160531 - Bastien: Cyclic import if import in top of file
154
         # TODO - 20160531 - Bastien: Cyclic import if import in top of file
156
         from tracim.config.app_cfg import CFG
155
         from tracim.config.app_cfg import CFG
157
         cfg = CFG.get_instance()
156
         cfg = CFG.get_instance()
158
-        return '{proto}://{domain}:{port}/user/{id}.ics#{slug_name}'.format(
157
+        return CALENDAR_USER_URL_TEMPLATE.format(
159
             proto='https' if cfg.RADICALE_CLIENT_SSL else 'http',
158
             proto='https' if cfg.RADICALE_CLIENT_SSL else 'http',
160
             domain=cfg.RADICALE_CLIENT_HOST or request.domain,
159
             domain=cfg.RADICALE_CLIENT_HOST or request.domain,
161
             port=cfg.RADICALE_CLIENT_PORT,
160
             port=cfg.RADICALE_CLIENT_PORT,
162
             id=self.user_id,
161
             id=self.user_id,
163
-            slug_name=slugify(self.get_display_name(
162
+            slug=slugify(self.get_display_name(
164
                 remove_email_part=True
163
                 remove_email_part=True
165
             ), only_ascii=True)
164
             ), only_ascii=True)
166
         )
165
         )

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

26
 from sqlalchemy.types import Unicode
26
 from sqlalchemy.types import Unicode
27
 from tg.i18n import lazy_ugettext as l_, ugettext as _
27
 from tg.i18n import lazy_ugettext as l_, ugettext as _
28
 
28
 
29
+from tracim.lib.calendar import CALENDAR_WORKSPACE_URL_TEMPLATE
29
 from tracim.lib.exception import ContentRevisionUpdateError
30
 from tracim.lib.exception import ContentRevisionUpdateError
30
 from tracim.model import DeclarativeBase, RevisionsIntegrity
31
 from tracim.model import DeclarativeBase, RevisionsIntegrity
31
 from tracim.model.auth import User
32
 from tracim.model.auth import User
72
         # TODO - 20160531 - Bastien: Cyclic import if import in top of file
73
         # TODO - 20160531 - Bastien: Cyclic import if import in top of file
73
         from tracim.config.app_cfg import CFG
74
         from tracim.config.app_cfg import CFG
74
         cfg = CFG.get_instance()
75
         cfg = CFG.get_instance()
75
-        return '{proto}://{domain}:{port}/workspace/{id}.ics#{slug}'.format(
76
+        return CALENDAR_WORKSPACE_URL_TEMPLATE.format(
76
             proto='https' if cfg.RADICALE_CLIENT_SSL else 'http',
77
             proto='https' if cfg.RADICALE_CLIENT_SSL else 'http',
77
             domain=cfg.RADICALE_CLIENT_HOST or tg.request.domain,
78
             domain=cfg.RADICALE_CLIENT_HOST or tg.request.domain,
78
             port=cfg.RADICALE_CLIENT_PORT,
79
             port=cfg.RADICALE_CLIENT_PORT,