浏览代码

User Calendar Event: Content without workspace

Bastien Sevajol (Algoo) 9 年前
父节点
当前提交
ae051684ea
共有 2 个文件被更改,包括 8 次插入2 次删除
  1. 5 1
      tracim/tracim/lib/calendar.py
  2. 3 1
      tracim/tracim/lib/content.py

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

165
             raise UnknownCalendarType('Type "{0}" is not implemented'
165
             raise UnknownCalendarType('Type "{0}" is not implemented'
166
                                       .format(type(calendar)))
166
                                       .format(type(calendar)))
167
 
167
 
168
-        content_api = ContentApi(current_user, force_show_all_types=True)
168
+        content_api = ContentApi(
169
+            current_user,
170
+            force_show_all_types=True,
171
+            disable_user_workspaces_filter=True
172
+        )
169
         content = content_api.find_one_by_unique_property(
173
         content = content_api.find_one_by_unique_property(
170
             property_name='name',
174
             property_name='name',
171
             property_value=event_name,
175
             property_value=event_name,

+ 3 - 1
tracim/tracim/lib/content.py 查看文件

82
             show_deleted=False,
82
             show_deleted=False,
83
             all_content_in_treeview=True,
83
             all_content_in_treeview=True,
84
             force_show_all_types=False,
84
             force_show_all_types=False,
85
+            disable_user_workspaces_filter=False,
85
     ):
86
     ):
86
         self._user = current_user
87
         self._user = current_user
87
         self._user_id = current_user.user_id if current_user else None
88
         self._user_id = current_user.user_id if current_user else None
89
         self._show_deleted = show_deleted
90
         self._show_deleted = show_deleted
90
         self._show_all_type_of_contents_in_treeview = all_content_in_treeview
91
         self._show_all_type_of_contents_in_treeview = all_content_in_treeview
91
         self._force_show_all_types = force_show_all_types
92
         self._force_show_all_types = force_show_all_types
93
+        self._disable_user_workspaces_filter = disable_user_workspaces_filter
92
 
94
 
93
     @classmethod
95
     @classmethod
94
     def get_revision_join(cls):
96
     def get_revision_join(cls):
180
         if workspace:
182
         if workspace:
181
             result = result.filter(Content.workspace_id==workspace.workspace_id)
183
             result = result.filter(Content.workspace_id==workspace.workspace_id)
182
 
184
 
183
-        if self._user:
185
+        if self._user and not self._disable_user_workspaces_filter:
184
             user = DBSession.query(User).get(self._user_id)
186
             user = DBSession.query(User).get(self._user_id)
185
             # Filter according to user workspaces
187
             # Filter according to user workspaces
186
             workspace_ids = [r.workspace_id for r in user.roles \
188
             workspace_ids = [r.workspace_id for r in user.roles \