[tryton-commits] changeset in sao:default Display revision on dialog

[Cédric Krier]

changeset bbe035407d10 in sao:default
details: https://hg.tryton.org/sao?cmd=changeset;node=bbe035407d10
description:
        Display revision on dialog

        issue10059
        review335531002
diffstat:

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

diffs (54 lines):

diff -r 48c4aedeccdc -r bbe035407d10 CHANGELOG
--- a/CHANGELOG Fri Feb 12 20:29:02 2021 +0100
+++ b/CHANGELOG Sun Feb 14 14:03:55 2021 +0100
@@ -1,3 +1,4 @@
+* Display revision on dialog
 * Support empty value for timedelta converter
 * Unify PYSON string format
 
diff -r 48c4aedeccdc -r bbe035407d10 src/tab.js
--- a/src/tab.js        Fri Feb 12 20:29:02 2021 +0100
+++ b/src/tab.js        Sun Feb 14 14:03:55 2021 +0100
@@ -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 -r 48c4aedeccdc -r bbe035407d10 src/window.js
--- a/src/window.js     Fri Feb 12 20:29:02 2021 +0100
+++ b/src/window.js     Sun Feb 14 14:03:55 2021 +0100
@@ -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;