details: https://code.tryton.org/tryton/commit/a8ff6c6b4d46
branch: default
user: Cédric Krier <[email protected]>
date: Wed Nov 12 14:57:12 2025 +0100
description:
Do not display error details if empty
diffstat:
sao/src/common.js | 14 ++++++++------
tryton/tryton/common/common.py | 40 +++++++++++++++++++++-------------------
2 files changed, 29 insertions(+), 25 deletions(-)
diffs (77 lines):
diff -r 8693a06919f2 -r a8ff6c6b4d46 sao/src/common.js
--- a/sao/src/common.js Wed Nov 12 14:56:34 2025 +0100
+++ b/sao/src/common.js Wed Nov 12 14:57:12 2025 +0100
@@ -3635,12 +3635,14 @@
'aria-expanded': false,
'aria-controls': '#error-detail',
}).text(Sao.i18n.gettext("Details"))));
- alert_.append(jQuery('<p/>', {
- 'class': 'collapse',
- id: 'error-detail',
- }).append(jQuery('<pre/>', {
- 'class': 'pre-scrollable',
- }).text(details)));
+ if (details) {
+ alert_.append(jQuery('<p/>', {
+ 'class': 'collapse',
+ id: 'error-detail',
+ }).append(jQuery('<pre/>', {
+ 'class': 'pre-scrollable',
+ }).text(details)));
+ }
jQuery('<a/>', {
'class': 'btn btn-link',
href: Sao.config.bug_url,
diff -r 8693a06919f2 -r a8ff6c6b4d46 tryton/tryton/common/common.py
--- a/tryton/tryton/common/common.py Wed Nov 12 14:56:34 2025 +0100
+++ b/tryton/tryton/common/common.py Wed Nov 12 14:57:12 2025 +0100
@@ -951,28 +951,30 @@
dialog.format_secondary_markup(
'<b>%s</b>' % GLib.markup_escape_text(title))
- scrolledwindow = Gtk.ScrolledWindow()
- scrolledwindow.set_policy(
- Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
- scrolledwindow.set_shadow_type(Gtk.ShadowType.NONE)
- scrolledwindow.set_min_content_height(300)
+ if details and details.strip():
+ scrolledwindow = Gtk.ScrolledWindow()
+ scrolledwindow.set_policy(
+ Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
+ scrolledwindow.set_shadow_type(Gtk.ShadowType.NONE)
+ scrolledwindow.set_min_content_height(300)
- viewport = Gtk.Viewport()
- viewport.set_shadow_type(Gtk.ShadowType.NONE)
+ viewport = Gtk.Viewport()
+ viewport.set_shadow_type(Gtk.ShadowType.NONE)
- textview = Gtk.TextView(editable=False, sensitive=True, monospace=True)
- buf = Gtk.TextBuffer()
- buf.set_text(details)
- textview.set_buffer(buf)
+ textview = Gtk.TextView(
+ editable=False, sensitive=True, monospace=True)
+ buf = Gtk.TextBuffer()
+ buf.set_text(details)
+ textview.set_buffer(buf)
- viewport.add(textview)
- scrolledwindow.add(viewport)
- expander = Gtk.Expander()
- expander.set_label(_("Details"))
- expander.add(scrolledwindow)
- expander.set_resize_toplevel(True)
- dialog.vbox.pack_start(
- expander, expand=False, fill=True, padding=0)
+ viewport.add(textview)
+ scrolledwindow.add(viewport)
+ expander = Gtk.Expander()
+ expander.set_label(_("Details"))
+ expander.add(scrolledwindow)
+ expander.set_resize_toplevel(True)
+ dialog.vbox.pack_start(
+ expander, expand=False, fill=True, padding=0)
button_roundup = Gtk.LinkButton.new_with_label(
CONFIG['bug.url'], _("Report Bug"))