This is an automated email from the ASF dual-hosted git repository. jleroux pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push: new 9351b641e8 Improved: Data of tenant specific component gets loaded in all instances (OFBIZ-6065) 9351b641e8 is described below commit 9351b641e8c798965531ef440e5efe79798172fc Author: Jacques Le Roux <jacques.le.r...@les7arts.com> AuthorDate: Wed Jul 27 16:20:55 2022 +0200 Improved: Data of tenant specific component gets loaded in all instances (OFBIZ-6065) The tenant relevant Gradle tasks are: OFBiz Server tasks ------------------ createTenant - Create a new tenant in your environment loadAdminUserLogin - Create admin user with temporary password equal to ofbiz. You must provide userLoginId loadAll - Load default data; meant for OFBiz development, testing, and demo purposes loadTenant - Load data using tenantId loadAll is the new "ant load-data" and should clearly only used for "OFBiz development, testing, and demo purposes". Remains the import functionalities. We don't want to get to far with that, a warning is enough. Thanks: Pierre Smits for report --- framework/webtools/config/WebtoolsUiLabels.xml | 6 +++++- framework/webtools/template/entity/EntityImport.ftl | 1 + framework/webtools/template/entity/EntityImportDir.ftl | 1 + framework/webtools/template/entity/EntityImportReaders.ftl | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/framework/webtools/config/WebtoolsUiLabels.xml b/framework/webtools/config/WebtoolsUiLabels.xml index 9cf9d79d21..f7aa5d792b 100644 --- a/framework/webtools/config/WebtoolsUiLabels.xml +++ b/framework/webtools/config/WebtoolsUiLabels.xml @@ -1611,7 +1611,7 @@ <value xml:lang="vi">Tên Ủy quyền (delegator) Đích:</value> <value xml:lang="zh">目标代表名称: </value> <value xml:lang="zh-TW">目標代表名稱: </value> - </property> + </property> <property key="WebtoolsDeleteFiles"> <value xml:lang="de">Dateien nachher löschen?</value> <value xml:lang="en">Delete Files Afterwards?</value> @@ -5981,6 +5981,10 @@ <value xml:lang="zh">本页面用于导入导出的实体引擎XML文档。这些文档都有一个根标签 "<entity-engine-xml>".</value> <value xml:lang="zh-TW">本頁面用於匯入匯出的資料實體引擎XML檔.這些檔都有一個根標簽 "<entity-engine-xml>".</entity-engine-xml></value> </property> + <property key="WebtoolsXMLImportInfoBewareTenant"> + <value xml:lang="en">Beware, if you are using tenant this acts as the "loadAll" Gradle task that says: "Load default data; meant for OFBiz development, testing, and demo purposes".</value> + <value xml:lang="fr">Attention, si vous utilisez la fonctionnalité "tenant", cela agit comme la tâche Gradle "loadAll" : "Charger les données par défaut ; destiné au développement, aux tests et à la démonstration OFBiz".</value> + </property> <property key="WebtoolsYouMayCreateAnEntity"> <value xml:lang="de">You may create an Entity ${entityName} by entering the values you want, and clicking Create.</value> <value xml:lang="en">You may create an Entity ${entityName} by entering the values you want, and clicking Create.</value> diff --git a/framework/webtools/template/entity/EntityImport.ftl b/framework/webtools/template/entity/EntityImport.ftl index 593f7fb00e..e4ef0bd23d 100644 --- a/framework/webtools/template/entity/EntityImport.ftl +++ b/framework/webtools/template/entity/EntityImport.ftl @@ -19,6 +19,7 @@ under the License. <div class="page-title"><span>${uiLabelMap.WebtoolsImportToDataSource}</span></div> <p>${uiLabelMap.WebtoolsXMLImportInfo}</p> +<p>${uiLabelMap.WebtoolsXMLImportInfoBewareTenant}</p> <hr /> <form class="basic-form" method="post" action="<@ofbizUrl>entityImport</@ofbizUrl>"> diff --git a/framework/webtools/template/entity/EntityImportDir.ftl b/framework/webtools/template/entity/EntityImportDir.ftl index d192853d00..b3c411c930 100644 --- a/framework/webtools/template/entity/EntityImportDir.ftl +++ b/framework/webtools/template/entity/EntityImportDir.ftl @@ -19,6 +19,7 @@ under the License. <div class="page-title"><span>${uiLabelMap.WebtoolsImportToDataSource}</span></div> <p>${uiLabelMap.WebtoolsXMLImportInfo}</p> +<p>${uiLabelMap.WebtoolsXMLImportInfoBewareTenant}</p> <hr /> <form class="basic-form" method="post" action="<@ofbizUrl>entityImportDir</@ofbizUrl>"> diff --git a/framework/webtools/template/entity/EntityImportReaders.ftl b/framework/webtools/template/entity/EntityImportReaders.ftl index f6212d3483..8627a5d3b4 100644 --- a/framework/webtools/template/entity/EntityImportReaders.ftl +++ b/framework/webtools/template/entity/EntityImportReaders.ftl @@ -19,6 +19,7 @@ under the License. <div class="page-title"><span>${uiLabelMap.WebtoolsImportToDataSource}</span></div> <p>${uiLabelMap.WebtoolsXMLImportInfo}</p> +<p>${uiLabelMap.WebtoolsXMLImportInfoBewareTenant}</p> <hr /> <form class="basic-form" method="post" action="<@ofbizUrl>entityImportReaders</@ofbizUrl>"> <table class="basic-table" cellspacing="0">