This is an automated email from the ASF dual-hosted git repository. nmalin pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit 3770cdbb383204b33fd070b8de67a982d83c4f00 Author: Nicolas Malin <[email protected]> AuthorDate: Wed Jul 7 10:10:27 2021 +0200 Implemented: Keep paginate list query on dynamic refresh (OFBIZ-12261) Complete previous commit with adding CommonDynamicGrid and CommonDynamicSingle form on common-theme previously forgot --- framework/common/widget/CommonForms.xml | 5 ++++- themes/common-theme/widget/CommonForms.xml | 3 +++ themes/common-theme/widget/Theme.xml | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/framework/common/widget/CommonForms.xml b/framework/common/widget/CommonForms.xml index 9d5bd30..8a732ad 100644 --- a/framework/common/widget/CommonForms.xml +++ b/framework/common/widget/CommonForms.xml @@ -25,6 +25,8 @@ under the License. commonFormLocations.CommonSimpleGrid ?: 'component://common-theme/widget/CommonForms.xml'}"/> <grid name="CommonBasicGrid" extends="CommonBasicGrid" extends-resource="${groovy: commonFormLocations.CommonBasicGrid ?: 'component://common-theme/widget/CommonForms.xml'}"/> + <grid name="CommonDynamicGrid" extends="CommonDynamicGrid" extends-resource="${groovy: + commonFormLocations.CommonDynamicGrid ?: 'component://common-theme/widget/CommonForms.xml'}"/> <form name="CommonSimpleList" extends="CommonSimpleList" extends-resource="${groovy: commonFormLocations.CommonSimpleList ?: 'component://common-theme/widget/CommonForms.xml'}"/> @@ -35,6 +37,7 @@ under the License. <form name="CommonBasicSingle" extends="CommonBasicSingle" extends-resource="${groovy: commonFormLocations.CommonBasicSingle ?: 'component://common-theme/widget/CommonForms.xml'}"/> - + <form name="CommonDynamicSingle" extends="CommonDynamicSingle" extends-resource="${groovy: + commonFormLocations.CommonDynamicSingle ?: 'component://common-theme/widget/CommonForms.xml'}"/> </forms> diff --git a/themes/common-theme/widget/CommonForms.xml b/themes/common-theme/widget/CommonForms.xml index b6bb24a..361b0eb 100644 --- a/themes/common-theme/widget/CommonForms.xml +++ b/themes/common-theme/widget/CommonForms.xml @@ -44,5 +44,8 @@ under the License. odd-row-style="alternate-row" header-row-style="header-row-2" separate-columns="true"/> <form name="CommonBasicSingle" type="single"/> + <form name="CommonDynamicSingle" type="single"> + <on-event-update-area event-type="submit"/> + </form> </forms> diff --git a/themes/common-theme/widget/Theme.xml b/themes/common-theme/widget/Theme.xml index fd7b726..58155a4 100644 --- a/themes/common-theme/widget/Theme.xml +++ b/themes/common-theme/widget/Theme.xml @@ -161,11 +161,13 @@ under the License. <root-decorator default-location="component://common-theme/widget/CommonForms.xml"> <form name="CommonSimpleGrid"/> <form name="CommonBasicGrid"/> + <form name="CommonDynamicGrid"/> <form name="CommonSimpleList"/> <form name="CommonBasicList"/> <form name="CommonDynamicList"/> <form name="CommonInLineEditList"/> <form name="CommonBasicSingle"/> + <form name="CommonDynamicSingle"/> </root-decorator> </common-forms> <common-menus><!--list all common menu to each application that each theme can be surcharge or not and use the menu present on common theme-->
