From cc4b356936865a11ad7d062644dd4e4ec85948b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sun, 14 Feb 2021 14:03:55 +0100
Subject: [PATCH] Display revision on dialog

issue10059
review335531002
---
 CHANGELOG     |  1 +
 src/tab.js    |  3 ++-
 src/window.js | 19 ++++++++++++++++++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index f182193066..9e47794fb1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,4 @@
+* Display revision on dialog
 * Support empty value for timedelta converter
 * Unify PYSON string format
 
diff --git a/src/tab.js b/src/tab.js
index 8ada25555f..1c52d2a31b 100644
--- a/src/tab.js
+++ b/src/tab.js
@@ -984,7 +984,8 @@
             var revision = this.screen.context._datetime;
             var label, title;
             if (revision) {
-                var date_format = Sao.common.date_format();
+                var date_format = Sao.common.date_format(
+                    this.screen.context.date_format);
                 var time_format = '%H:%M:%S.%f';
                 var revision_label = ' @ ' + Sao.common.format_datetime(
                     date_format, time_format, revision);
diff --git a/src/window.js b/src/window.js
index 425ce6ae32..9ec38b8a44 100644
--- a/src/window.js
+++ b/src/window.js
@@ -95,11 +95,28 @@
             this.context = kwargs.context || null;
             this.save_current = kwargs.save_current;
             var title_prm = jQuery.when(kwargs.title || '');
-            title_prm.then(function(title) {
+            title_prm = title_prm.then(function(title) {
                 if (!title) {
                     title = Sao.common.MODELNAME.get(this.screen.model_name);
                 }
                 this.title = title;
+                var revision = this.screen.context._datetime;
+                var label;
+                if (revision &&
+                    Sao.common.MODELHISTORY.contains(this.screen.model_name)) {
+                    var date_format = Sao.common.date_format(
+                    this.screen.context.date_format);
+                    var time_format = '%H:%M:%S.%f';
+                    var revision_label = ' @ ' + Sao.common.format_datetime(
+                        date_format, time_format, revision);
+                    label = Sao.common.ellipsize(
+                        this.title, 80 - revision_label.length) +
+                        revision_label;
+                    title = this.title + revision_label;
+                } else {
+                    label = Sao.common.ellipsize(this.title, 80);
+                }
+                return title;
             }.bind(this));
 
             this.prev_view = screen.current_view;