This is an automated email from the ASF dual-hosted git repository. jleroux pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ofbiz-site.git
The following commit(s) were added to refs/heads/master by this push: new 67b13d9 Revert "Improved: updates DTDs" 67b13d9 is described below commit 67b13d99e6f4772f64a9aa83b5953b7a97b127c1 Author: Jacques Le Roux <jacques.le.r...@les7arts.com> AuthorDate: Sun Jun 11 17:37:07 2023 +0200 Revert "Improved: updates DTDs" This reverts commit a3afa144c9e4e8403f19ffbf24fef81266b535e5. It was totally wrong. I'm not sure why. I use an automated updating script... --- dtds/services.xsd | 2 +- dtds/site-conf.xsd | 41 ++++++++++++++++++++++++++++++++++++++--- dtds/widget-common.xsd | 12 ++++++++++++ dtds/widget-form.xsd | 12 +++++++++++- 4 files changed, 62 insertions(+), 5 deletions(-) diff --git a/dtds/services.xsd b/dtds/services.xsd index 7620381..e7e90b4 100644 --- a/dtds/services.xsd +++ b/dtds/services.xsd @@ -41,7 +41,7 @@ under the License. <xs:element minOccurs="0" ref="description"/> <xs:element minOccurs="0" ref="namespace"/> <xs:element minOccurs="0" maxOccurs="1" ref="deprecated"/> - <xs:element minOccurs="0" ref="notification"/> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="notification"/> <xs:element minOccurs="0" maxOccurs="1" ref="permission-service"/> <xs:element minOccurs="0" maxOccurs="unbounded" ref="required-permissions"/> <xs:element minOccurs="0" maxOccurs="unbounded" ref="implements"/> diff --git a/dtds/site-conf.xsd b/dtds/site-conf.xsd index 44d98a5..8f3bf37 100644 --- a/dtds/site-conf.xsd +++ b/dtds/site-conf.xsd @@ -382,6 +382,40 @@ under the License. </xs:attribute> </xs:complexType> </xs:element> + <xs:element name="return-user-message"> + <xs:annotation> + <xs:documentation> + Before return a response to the end user, we can override the event message from different origin. + Hard coded, from the labelling system or from a given field + </xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:attribute name="ressource" type="xs:string"> + <xs:annotation> + <xs:documentation> + Properties ressource to use for resolve the message, if you set a value here, indicate the key on value attribute + otherwise this attribute will be ignored. + 'like: CommonUiLabels' + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="value" type="xs:string"> + <xs:annotation> + <xs:documentation> + Value to use to display the response user message. + You can set a plain text, a flexible string or use a key from the property file give in ressource attribute. + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="from-field" type="xs:string"> + <xs:annotation> + <xs:documentation> + Set from what field in context we can found the response user message. This field can contain a flexible string + </xs:documentation> + </xs:annotation> + </xs:attribute> + </xs:complexType> + </xs:element> <xs:element name="event"> <xs:annotation> <xs:documentation> @@ -417,7 +451,7 @@ under the License. after-login, before-logout) where the name allows to differentiate them. - Most of the time reques-maps, which have only 1 event, don't use it. + Most of the time request-maps, which have only 1 event, don't use it. </xs:documentation> </xs:annotation> </xs:attribute> @@ -457,7 +491,7 @@ under the License. <xs:documentation> You can have one response for each possible return code from the event. An event can return any string, and that string can be used to route to different responses. - At least one reponse by request-map. + At least one response by request-map. </xs:documentation> </xs:annotation> <xs:complexType> @@ -469,6 +503,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:element> + <xs:element minOccurs="0" ref="return-user-message"/> </xs:sequence> <xs:attributeGroup ref="attlist.response"/> </xs:complexType> @@ -477,7 +512,7 @@ under the License. <xs:attribute name="name" type="xs:string" use="required"> <xs:annotation> <xs:documentation> - The name of the response, wich also matches the string returned by the event + The name of the response, that also matches the string returned by the event </xs:documentation> </xs:annotation> </xs:attribute> diff --git a/dtds/widget-common.xsd b/dtds/widget-common.xsd index 4ceebcc..d164f61 100644 --- a/dtds/widget-common.xsd +++ b/dtds/widget-common.xsd @@ -522,6 +522,18 @@ under the License. <xs:attribute name="send-if-empty" type="xs:boolean" default="true"/> </xs:complexType> </xs:element> + <xs:element name="auto-parameters-form"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" ref="exclude" /> + </xs:sequence> + <xs:attribute name="form-name" type="xs:string"> + <xs:annotation> + <xs:documentation>See OFBIZ-12684.</xs:documentation> + </xs:annotation> + </xs:attribute> + </xs:complexType> + </xs:element> <xs:element name="exclude"> <xs:complexType> <xs:attribute name="field-name" type="xs:string" use="required" /> diff --git a/dtds/widget-form.xsd b/dtds/widget-form.xsd index 50c779e..bb5c1d5 100644 --- a/dtds/widget-form.xsd +++ b/dtds/widget-form.xsd @@ -586,6 +586,7 @@ under the License. <xs:sequence> <xs:element minOccurs="0" ref="auto-parameters-service"/> <xs:element minOccurs="0" ref="auto-parameters-entity"/> + <xs:element minOccurs="0" ref="auto-parameters-form"/> <xs:element minOccurs="0" maxOccurs="unbounded" ref="parameter" /> </xs:sequence> <xs:attribute name="event-type" use="required"> @@ -856,7 +857,15 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="disabled" type="xs:boolean" default="false"/> + <xs:attribute type="xs:string" name="disabled"> + <xs:annotation> + <xs:documentation> + Set a field as disabled : not mutable, not focusable, not submitted if in a form. + Accepts ${} notation to allow use of expressions. + Expressions must evaluate to the strings 'true', 'false' (without quotes) or empty (equivalent to false) + </xs:documentation> + </xs:annotation> + </xs:attribute> </xs:complexType> </xs:element> @@ -1549,6 +1558,7 @@ under the License. <xs:sequence> <xs:element minOccurs="0" ref="auto-parameters-service"/> <xs:element minOccurs="0" ref="auto-parameters-entity"/> + <xs:element minOccurs="0" ref="auto-parameters-form"/> <xs:element minOccurs="0" maxOccurs="unbounded" ref="parameter" /> </xs:sequence> <xs:attribute name="event-type" use="required">