Selaa lähdekoodia

Calendar urls: replace slug by extra

Bastien Sevajol (Algoo) 9 vuotta sitten
vanhempi
commit
f2f56a2e2c

+ 3 - 3
tracim/tracim/lib/calendar.py Näytä tiedosto

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

+ 1 - 1
tracim/tracim/model/auth.py Näytä tiedosto

159
             domain=cfg.RADICALE_CLIENT_HOST or request.domain,
159
             domain=cfg.RADICALE_CLIENT_HOST or request.domain,
160
             port=cfg.RADICALE_CLIENT_PORT,
160
             port=cfg.RADICALE_CLIENT_PORT,
161
             id=self.user_id,
161
             id=self.user_id,
162
-            slug=slugify(self.get_display_name(
162
+            extra='#' + slugify(self.get_display_name(
163
                 remove_email_part=True
163
                 remove_email_part=True
164
             ), only_ascii=True)
164
             ), only_ascii=True)
165
         )
165
         )

+ 1 - 1
tracim/tracim/model/data.py Näytä tiedosto

78
             domain=cfg.RADICALE_CLIENT_HOST or tg.request.domain,
78
             domain=cfg.RADICALE_CLIENT_HOST or tg.request.domain,
79
             port=cfg.RADICALE_CLIENT_PORT,
79
             port=cfg.RADICALE_CLIENT_PORT,
80
             id=self.workspace_id,
80
             id=self.workspace_id,
81
-            slug=slugify(self.label)
81
+            extra='#' + slugify(self.label),
82
         )
82
         )
83
 
83
 
84
     def get_user_role(self, user: User) -> int:
84
     def get_user_role(self, user: User) -> int: