Browse Source

Merge branch 'beta_1.0'

tracim 8 years ago
parent
commit
49d4ca36bf
2 changed files with 2 additions and 4 deletions
  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 View File

235
             ActionDescription.COMMENT,
235
             ActionDescription.COMMENT,
236
             ActionDescription.CREATION,
236
             ActionDescription.CREATION,
237
             ActionDescription.EDITION,
237
             ActionDescription.EDITION,
238
-            ActionDescription.REVISION
238
+            ActionDescription.REVISION,
239
+            ActionDescription.STATUS_UPDATE
239
         ]
240
         ]
240
 
241
 
241
         self.EMAIL_NOTIFICATION_NOTIFIED_CONTENTS = [
242
         self.EMAIL_NOTIFICATION_NOTIFIED_CONTENTS = [

+ 0 - 3
tracim/tracim/lib/content.py View File

196
     def _base_query(self, workspace: Workspace=None):
196
     def _base_query(self, workspace: Workspace=None):
197
         result = self.__real_base_query(workspace)
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
         if not self._show_deleted:
199
         if not self._show_deleted:
203
             result = result.filter(Content.is_deleted==False)
200
             result = result.filter(Content.is_deleted==False)
204
 
201