Bastien Sevajol (Algoo) 9 лет назад
Родитель
Сommit
2c4277221a
2 измененных файлов: 5 добавлений и 5 удалений
  1. 4 4
      tracim/tracim/lib/calendar.py
  2. 1 1
      tracim/tracim/lib/radicale/rights.py

+ 4 - 4
tracim/tracim/lib/calendar.py Просмотреть файл

14
 from tracim.model.data import ActionDescription
14
 from tracim.model.data import ActionDescription
15
 from tracim.model.data import Content
15
 from tracim.model.data import Content
16
 from tracim.model.data import ContentType
16
 from tracim.model.data import ContentType
17
-from tracim.model.organizational import Calendar
18
-from tracim.model.organizational import UserCalendar
19
-from tracim.model.organizational import WorkspaceCalendar
17
+from tracim.model.organisational import Calendar
18
+from tracim.model.organisational import UserCalendar
19
+from tracim.model.organisational import WorkspaceCalendar
20
 
20
 
21
 CALENDAR_USER_PATH_RE = 'user\/([0-9]+).ics'
21
 CALENDAR_USER_PATH_RE = 'user\/([0-9]+).ics'
22
 CALENDAR_WORKSPACE_PATH_RE = 'workspace\/([0-9]+).ics'
22
 CALENDAR_WORKSPACE_PATH_RE = 'workspace\/([0-9]+).ics'
85
 
85
 
86
     def get_calendar(self, type: str, id: str, path: str) -> Calendar:
86
     def get_calendar(self, type: str, id: str, path: str) -> Calendar:
87
         """
87
         """
88
-        Return tracim.model.organizational.Calendar instance for given
88
+        Return tracim.model.organisational.Calendar instance for given
89
         parameters.
89
         parameters.
90
         :param type: Type of calendar, can be one of CALENDAR_TYPE_USER,
90
         :param type: Type of calendar, can be one of CALENDAR_TYPE_USER,
91
         CALENDAR_TYPE_WORKSPACE
91
         CALENDAR_TYPE_WORKSPACE

+ 1 - 1
tracim/tracim/lib/radicale/rights.py Просмотреть файл

1
 from tracim.lib.calendar import CalendarManager
1
 from tracim.lib.calendar import CalendarManager
2
 from tracim.lib.exceptions import NotFound
2
 from tracim.lib.exceptions import NotFound
3
 from tracim.lib.user import UserApi
3
 from tracim.lib.user import UserApi
4
-from tracim.model.organizational import CALENDAR_PERMISSION_READ
4
+from tracim.model.organisational import CALENDAR_PERMISSION_READ
5
 
5
 
6
 
6
 
7
 def authorized(user, collection, permission):
7
 def authorized(user, collection, permission):