Calendar URLs in constants

tracim/tracim/lib/calendar.py

@@ -24,6 +24,11 @@ CALENDAR_WORKSPACE_PATH_RE = 'workspace\/([0-9]+).ics'
 CALENDAR_TYPE_USER = UserCalendar
 CALENDAR_TYPE_WORKSPACE = WorkspaceCalendar
 
+CALENDAR_USER_URL_TEMPLATE = \
+    '{proto}://{domain}:{port}/user/{id}.ics#{slug}'
+CALENDAR_WORKSPACE_URL_TEMPLATE = \
+    '{proto}://{domain}:{port}/workspace/{id}.ics#{slug}'
+
 
 class CalendarManager(object):
     def __init__(self, user: User):

tracim/tracim/model/auth.py

@@ -28,8 +28,7 @@ from sqlalchemy.types import DateTime
 from sqlalchemy.types import Boolean
 from sqlalchemy.orm import relation, relationship, synonym
 from tg import request
-from tg import config
-
+from tracim.lib.calendar import CALENDAR_USER_URL_TEMPLATE
 from tracim.model import DeclarativeBase, metadata, DBSession
 
 # This is the association table for the many-to-many relationship between
@@ -155,12 +154,12 @@ 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}.ics#{slug_name}'.format(
+        return CALENDAR_USER_URL_TEMPLATE.format(
             proto='https' if cfg.RADICALE_CLIENT_SSL else 'http',
             domain=cfg.RADICALE_CLIENT_HOST or request.domain,
             port=cfg.RADICALE_CLIENT_PORT,
             id=self.user_id,
-            slug_name=slugify(self.get_display_name(
+            slug=slugify(self.get_display_name(
                 remove_email_part=True
             ), only_ascii=True)
         )

tracim/tracim/model/data.py

@@ -26,6 +26,7 @@ from sqlalchemy.types import Text
 from sqlalchemy.types import Unicode
 from tg.i18n import lazy_ugettext as l_, ugettext as _
 
+from tracim.lib.calendar import CALENDAR_WORKSPACE_URL_TEMPLATE
 from tracim.lib.exception import ContentRevisionUpdateError
 from tracim.model import DeclarativeBase, RevisionsIntegrity
 from tracim.model.auth import User
@@ -72,7 +73,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}.ics#{slug}'.format(
+        return CALENDAR_WORKSPACE_URL_TEMPLATE.format(
             proto='https' if cfg.RADICALE_CLIENT_SSL else 'http',
             domain=cfg.RADICALE_CLIENT_HOST or tg.request.domain,
             port=cfg.RADICALE_CLIENT_PORT,