From aa6037385f2cc5f6dca5d97ef9c7543de919f50f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sat, 20 Mar 2021 12:50:28 +0100 Subject: [PATCH] Define as option the type attribute of image issue10140 --- trytond/ir/ui/form.rnc | 2 +- trytond/ir/ui/form.rng | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/trytond/ir/ui/form.rnc b/trytond/ir/ui/form.rnc index a83e031ce3..e35454db5b 100644 --- a/trytond/ir/ui/form.rnc +++ b/trytond/ir/ui/form.rnc @@ -111,7 +111,7 @@ attlist.field &= attlist.field &= attribute symbol { text }? image = element image { attlist.image, empty } attlist.image &= attribute name { text } -attlist.image &= [a:defaultValue = "icon"] attribute type { "icon" | "url" } +attlist.image &= [a:defaultValue = "icon"] attribute type { "icon" | "url" }? attlist.affix &= attribute url_size { text }? attlist.image &= [ a:defaultValue = "1" ] attribute colspan { text }? attlist.image &= diff --git a/trytond/ir/ui/form.rng b/trytond/ir/ui/form.rng index c49230bf92..ccf80035c2 100644 --- a/trytond/ir/ui/form.rng +++ b/trytond/ir/ui/form.rng @@ -506,13 +506,15 @@ - - type - - icon - url - - + + + type + + icon + url + + +