displays the name of the modifier too

tracim/tracim/model/data.py

@@ -1043,6 +1043,10 @@ class Content(DeclarativeBase):
         return self.revisions[0]  # FIXME
 
     @property
+    def last_revision(self) -> ContentRevisionRO:
+        return self.revisions[-1]
+
+    @property
     def is_editable(self) -> bool:
         return not self.is_archived and not self.is_deleted
 

tracim/tracim/model/serializers.py

@@ -392,6 +392,7 @@ def serialize_node_for_page(content: Content, context: Context):
             label=data_container.label,
             icon=ContentType.get_icon(content.type),
             owner=context.toDict(content.first_revision.owner),
+            last_author=context.toDict(content.last_revision.owner),
             status=context.toDict(data_container.get_status()),
             links=[],
             revision_nb = len(content.revisions),
@@ -463,6 +464,7 @@ def serialize_node_for_thread(item: Content, context: Context):
             label = item.label,
             links=[],
             owner = context.toDict(item.owner),
+            last_author=context.toDict(item.last_revision.owner),
             parent = context.toDict(item.parent),
             selected_revision = 'latest',
             status = context.toDict(item.get_status()),

tracim/tracim/templates/file/getone.mak

@@ -52,10 +52,13 @@
             <div style="margin: -1.5em auto -1.5em auto;" class="tracim-less-visible">
                 <% created_localized = h.get_with_timezone(result.file.created) %>
                 <% updated_localized = h.get_with_timezone(result.file.updated) %>
-              <p>${_('file created on {date} at {time} by <b>{author}</b>').format(date=h.date(created_localized), time=h.time(created_localized), author=result.file.owner.name)|n}</p>
-              % if result.file.revision_nb > 1:
-                  <p>${_(' (last modification on {update_date} at {update_time})').format(update_date=h.update_date(updated_localized), update_time=h.update_time(updated_localized))|n}</p>
-              % endif
+                <% last_author = result.file.last_author.name %>
+              <p>${_('file created on {date} at {time} by <b>{author}</b>').format(date=h.date(created_localized), time=h.time(created_localized), author=result.file.owner.name)|n}
+                  % if result.file.revision_nb > 1:
+                      ${_(' (last modification on {update_date} at {update_time} by {last_author})').format(update_date=h.update_date(updated_localized), update_time=h.update_time(updated_localized), last_author = last_author)|n}
+                  % endif
+              </p>
+
             </div>
         </div>
     </div>

tracim/tracim/templates/page/getone.mak

@@ -50,10 +50,13 @@
             <div style="margin: -1.5em auto -1.5em auto;" class="tracim-less-visible">
                 <% created_localized = h.get_with_timezone(result.page.created) %>
                 <% updated_localized = h.get_with_timezone(result.page.updated) %>
-                <p>${_('page created on {date} at {time} by <b>{author}</b> ').format(date=h.date(created_localized), time=h.time(created_localized), author=result.page.owner.name)|n}</p>
-              % if result.page.revision_nb > 1:
-                  <p>${_(' (last modification on {update_date} at {update_time})').format(update_date=h.update_date(updated_localized), update_time=h.update_time(updated_localized))|n}</p>
-              % endif
+                <% last_author = result.page.last_author.name %>
+                <p>
+                    ${_('page created on {date} at {time} by <b>{author}</b> ').format(date=h.date(created_localized), time=h.time(created_localized), author=result.page.owner.name)|n}
+                    % if result.page.revision_nb > 1:
+                      ${_('(last modification on {update_date} at {update_time} by {last_author})').format(update_date=h.update_date(updated_localized), update_time=h.update_time(updated_localized), last_author = last_author)|n}
+                    % endif
+                </p>
             </div>
         </div>
     </div>

tracim/tracim/templates/thread/getone.mak

@@ -52,10 +52,13 @@
             <div style="margin: -1.5em auto -1.5em auto;" class="tracim-less-visible">
                 <% created_localized = h.get_with_timezone(result.thread.created) %>
                 <% updated_localized = h.get_with_timezone(result.thread.updated) %>
-                <p>${_('page created on {date} at {time} by <b>{author}</b>').format(date=h.date(created_localized), time=h.time(created_localized), author=result.thread.owner.name)|n}</p>
-                % if result.thread.revision_nb > 1:
-                  <p>${_(' (last modification on {update_date} at {update_time})').format(update_date=h.update_date(updated_localized), update_time=h.update_time(updated_localized))|n}</p>
-              % endif
+                <% last_author = result.thread.last_author.name %>
+                <p>${_('page created on {date} at {time} by <b>{author}</b>').format(date=h.date(created_localized), time=h.time(created_localized), author=result.thread.owner.name)|n}
+                    % if result.thread.revision_nb > 1:
+                      ${_(' (last modification on {update_date} at {update_time} by {last_author})').format(update_date=h.update_date(updated_localized), update_time=h.update_time(updated_localized), last_author = last_author)|n}
+                    % endif
+                </p>
+
         </div>
     </div>