fix #326

tracim/tracim/lib/webdav/design.py

@@ -148,7 +148,7 @@ def create_readable_date(created, delta_from_datetime: datetime = None):
     return aff
 
 def designPage(content: data.Content, content_revision: data.ContentRevisionRO) -> str:
-    hist = content.get_history()
+    hist = content.get_history(drop_empty_revision=False)
     histHTML = '<table class="table table-striped table-hover">'
     for event in hist:
         if isinstance(event, VirtualEvent):
@@ -237,7 +237,7 @@ def designPage(content: data.Content, content_revision: data.ContentRevisionRO)
     return page
 
 def designThread(content: data.Content, content_revision: data.ContentRevisionRO, comments) -> str:
-        hist = content.get_history()
+        hist = content.get_history(drop_empty_revision=False)
 
         allT = []
         allT += comments

tracim/tracim/model/data.py

@@ -1234,11 +1234,24 @@ class Content(DeclarativeBase):
 
         return ContentType.sorted(types)
 
-    def get_history(self) -> '[VirtualEvent]':
+    def get_history(self, drop_empty_revision=False) -> '[VirtualEvent]':
         events = []
         for comment in self.get_comments():
             events.append(VirtualEvent.create_from_content(comment))
-        for revision in self.revisions:
+
+        revisions = sorted(self.revisions, key=lambda rev: rev.revision_id)
+        for revision in revisions:
+            # INFO - G.M - 09-03-2018 - Do not show file revision with empty
+            # file to have a more clear view of revision.
+            # Some webdav client create empty file before uploading, we must
+            # have possibility to not show the related revision
+            if drop_empty_revision:
+                if revision.depot_file and revision.depot_file.file.content_length == 0:  # nopep8
+                    # INFO - G.M - 12-03-2018 -Always show the last and
+                    # first revision.
+                    if revision != revisions[-1] and revision != revisions[0]:
+                        continue
+
             events.append(VirtualEvent.create_from_content_revision(revision))
 
         sorted_events = sorted(events,

tracim/tracim/model/serializers.py

@@ -398,7 +398,7 @@ def serialize_node_for_page(content: Content, context: Context):
             links=[],
             revision_nb = len(content.revisions),
             selected_revision='latest' if content.revision_to_serialize<=0 else content.revision_to_serialize,
-            history=Context(CTX.CONTENT_HISTORY).toDict(content.get_history()),
+            history=Context(CTX.CONTENT_HISTORY).toDict(content.get_history(drop_empty_revision=True)),  # nopep8
             is_editable=content.is_editable,
             is_deleted=content.is_deleted,
             is_archived=content.is_archived,
@@ -475,7 +475,7 @@ def serialize_node_for_thread(item: Content, context: Context):
             workspace = context.toDict(item.workspace),
             comments = reversed(context.toDict(item.get_comments())),
             is_new=item.has_new_information_for(context.get_user()),
-            history = Context(CTX.CONTENT_HISTORY).toDict(item.get_history()),
+            history = Context(CTX.CONTENT_HISTORY).toDict(item.get_history(drop_empty_revision=True)),  # nopep8
             is_editable=item.is_editable,
             is_deleted=item.is_deleted,
             is_archived=item.is_archived,