浏览代码

Merge branch 'beta_1.0'

tracim 7 年前
父节点
当前提交
49d4ca36bf
共有 2 个文件被更改,包括 2 次插入4 次删除
  1. 2 1
      tracim/tracim/config/app_cfg.py
  2. 0 3
      tracim/tracim/lib/content.py

+ 2 - 1
tracim/tracim/config/app_cfg.py 查看文件

@@ -235,7 +235,8 @@ class CFG(object):
235 235
             ActionDescription.COMMENT,
236 236
             ActionDescription.CREATION,
237 237
             ActionDescription.EDITION,
238
-            ActionDescription.REVISION
238
+            ActionDescription.REVISION,
239
+            ActionDescription.STATUS_UPDATE
239 240
         ]
240 241
 
241 242
         self.EMAIL_NOTIFICATION_NOTIFIED_CONTENTS = [

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

@@ -196,9 +196,6 @@ class ContentApi(object):
196 196
     def _base_query(self, workspace: Workspace=None):
197 197
         result = self.__real_base_query(workspace)
198 198
 
199
-        # FIXME - 2016-10-17 - D.A. - Do not show temporary files
200
-        result = result.filter(Content.is_temporary == False)
201
-
202 199
         if not self._show_deleted:
203 200
             result = result.filter(Content.is_deleted==False)
204 201