From 93dc054222e2da625fa2f6718380dcefdee2ad97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Mon, 14 Aug 2023 19:44:38 +0200
Subject: [PATCH] Select current revision when showing the revision popup

Closes #12472
---
 sao/src/tab.js    |  8 +++++++-
 sao/src/window.js | 15 +++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/sao/src/tab.js b/sao/src/tab.js
index a9c4d26457..2a5ec448dd 100644
--- a/sao/src/tab.js
+++ b/sao/src/tab.js
@@ -993,7 +993,13 @@
                 return this.screen.model.execute('history_revisions',
                     [ids], this.screen.context)
                     .then(revisions => {
-                        new Sao.Window.Revision(revisions, set_revision(revisions));
+                        const revision = this.screen.context._datetime;
+                        if (revision) {
+                            // Remove a millisecond as microseconds are truncated
+                            revision.add(-1, 'milliseconds');
+                        }
+                        new Sao.Window.Revision(
+                            revisions, revision, set_revision(revisions));
                     });
             });
         },
diff --git a/sao/src/window.js b/sao/src/window.js
index 9dc762a0e8..642fbf7671 100644
--- a/sao/src/window.js
+++ b/sao/src/window.js
@@ -1083,7 +1083,7 @@
     });
 
     Sao.Window.Revision = Sao.class_(Object, {
-        init: function(revisions, callback) {
+        init: function(revisions, revision, callback) {
             this.callback = callback;
             var dialog = new Sao.Dialog(
                     Sao.i18n.gettext('Revision'), '', 'lg');
@@ -1124,15 +1124,18 @@
                 value: null,
                 text: ''
             }));
-            for (let revision of revisions) {
-                var name = revision[2];
-                revision = revision[0];
+            for (let rev of revisions) {
+                var name = rev[2];
+                rev = rev[0];
                 this.select.append(jQuery('<option/>', {
-                    value: revision.valueOf(),
+                    value: rev.valueOf(),
                     text: Sao.common.format_datetime(
-                        date_format + ' ' + time_format, revision) + ' ' + name,
+                        date_format + ' ' + time_format, rev) + ' ' + name,
                 }));
             }
+            if (revision) {
+                this.select.val(revision.valueOf());
+            }
             this.el.modal('show');
             this.el.on('hidden.bs.modal', function(event) {
                 jQuery(this).remove();