tryton-do/tryton
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Display revision on dialog

Browse Source 
issue10059
review335531002
This commit is contained in:
Cédric Krier
2021-02-14 14:03:55 +01:00
parent b52e343622
commit cc4b356936
3 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG
+1
View File
@@ -1,3 +1,4 @@
* Display revision on dialog
* Support empty value for timedelta converter
* Unify PYSON string format
src/tab.js
+2 -1
View File
@@ -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);
src/window.js
+18 -1
View File
@@ -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;