Improved: Data of tenant specific component gets loaded in all instances (OFBIZ-6065)
Improves the information provided about importing and loadAll Gradle task
loadTenant Gradle task should be used when necessary
diff --git a/framework/webtools/config/WebtoolsUiLabels.xml b/framework/webtools/config/WebtoolsUiLabels.xml
index f7aa5d7..f8704e2 100644
--- a/framework/webtools/config/WebtoolsUiLabels.xml
+++ b/framework/webtools/config/WebtoolsUiLabels.xml
@@ -5981,9 +5981,13 @@
<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 key="WebtoolsXMLImportInfoBewareTenant1">
+ <value xml:lang="en">Beware, you are using tenant, import 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, vous utilisez la fonctionnalité "tenant", l'import 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="WebtoolsXMLImportInfoBewareTenant2">
+ <value xml:lang="en">You should use the "loadTenant" Gradle task to load tenant specific data.</value>
+ <value xml:lang="fr">Vous devez utiliser la tâche Gradle "loadTenant" pour charger des données spécifiques à un tenant.</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>
diff --git a/framework/webtools/template/entity/EntityImport.ftl b/framework/webtools/template/entity/EntityImport.ftl
index e4ef0bd..c99dff2 100644
--- a/framework/webtools/template/entity/EntityImport.ftl
+++ b/framework/webtools/template/entity/EntityImport.ftl
@@ -19,7 +19,11 @@
<div class="page-title"><span>${uiLabelMap.WebtoolsImportToDataSource}</span></div>
<p>${uiLabelMap.WebtoolsXMLImportInfo}</p>
-<p>${uiLabelMap.WebtoolsXMLImportInfoBewareTenant}</p>
+<#assign tenantUsed = Static["org.apache.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("general", "multitenant", "N", delegator)>
+<#if tenantUsed=="Y">
+ <p>${uiLabelMap.WebtoolsXMLImportInfoBewareTenant1}</p>
+ <p>${uiLabelMap.WebtoolsXMLImportInfoBewareTenant2}</p>
+</#if>
<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 b3c411c..d78235a 100644
--- a/framework/webtools/template/entity/EntityImportDir.ftl
+++ b/framework/webtools/template/entity/EntityImportDir.ftl
@@ -19,7 +19,11 @@
<div class="page-title"><span>${uiLabelMap.WebtoolsImportToDataSource}</span></div>
<p>${uiLabelMap.WebtoolsXMLImportInfo}</p>
-<p>${uiLabelMap.WebtoolsXMLImportInfoBewareTenant}</p>
+<#assign tenantUsed = Static["org.apache.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("general", "multitenant", "N", delegator)>
+<#if tenantUsed=="Y">
+ <p>${uiLabelMap.WebtoolsXMLImportInfoBewareTenant1}</p>
+ <p>${uiLabelMap.WebtoolsXMLImportInfoBewareTenant2}</p>
+</#if>
<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 8627a5d..2e193b6 100644
--- a/framework/webtools/template/entity/EntityImportReaders.ftl
+++ b/framework/webtools/template/entity/EntityImportReaders.ftl
@@ -19,7 +19,11 @@
<div class="page-title"><span>${uiLabelMap.WebtoolsImportToDataSource}</span></div>
<p>${uiLabelMap.WebtoolsXMLImportInfo}</p>
-<p>${uiLabelMap.WebtoolsXMLImportInfoBewareTenant}</p>
+<#assign tenantUsed = Static["org.apache.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("general", "multitenant", "N", delegator)>
+<#if tenantUsed=="Y">
+ <p>${uiLabelMap.WebtoolsXMLImportInfoBewareTenant1}</p>
+ <p>${uiLabelMap.WebtoolsXMLImportInfoBewareTenant2}</p>
+</#if>
<hr />
<form class="basic-form" method="post" action="<@ofbizUrl>entityImportReaders</@ofbizUrl>">
<table class="basic-table" cellspacing="0">
