[ofbiz-framework] branch release18.12 updated: Improved: Data of tenant specific component gets loaded in all instances (OFBIZ-6065)

[jleroux]

This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/release18.12 by this push:
     new c0b5072a90 Improved: Data of tenant specific component gets loaded in 
all instances (OFBIZ-6065)
c0b5072a90 is described below

commit c0b5072a90d6bf9620e68f1220fdb48e4f11cc3c
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
    
    Conflicts handled by handin framework/webtools/config/WebtoolsUiLabels.xml
---
 framework/webtools/config/WebtoolsUiLabels.xml           | 16 ++++++++++++++++
 framework/webtools/template/entity/EntityImport.ftl      |  1 +
 framework/webtools/template/entity/EntityImportDir.ftl   |  1 +
 .../webtools/template/entity/EntityImportReaders.ftl     |  1 +
 4 files changed, 19 insertions(+)

diff --git a/framework/webtools/config/WebtoolsUiLabels.xml 
b/framework/webtools/config/WebtoolsUiLabels.xml
index 824f5a567e..1d1046a408 100644
--- a/framework/webtools/config/WebtoolsUiLabels.xml
+++ b/framework/webtools/config/WebtoolsUiLabels.xml
@@ -1600,6 +1600,18 @@
         <value xml:lang="zh">定义位置</value>
         <value xml:lang="zh-TW">定義位置</value>
     </property>
+    <property key="WebtoolsDelegatorName">
+        <value xml:lang="de">Name Delegator:</value>
+        <value xml:lang="en">Delegator Name:</value>
+        <value xml:lang="fr">Nom du délégateur :</value>
+        <value xml:lang="it">Nome Delegator:</value>
+        <value xml:lang="ja">対象デリゲータ名称:</value>
+        <value xml:lang="pt">Name do Delegator:</value>
+        <value xml:lang="ro">Nume Delegator:</value>
+        <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 key="WebtoolsDeleteFiles">
         <value xml:lang="de">Dateien nachher löschen?</value>
         <value xml:lang="en">Delete Files Afterwards?</value>
@@ -5969,6 +5981,10 @@
         <value xml:lang="zh">本页面用于导入导出的实体引擎XML文档。这些文档都有一个根标签 
"&lt;entity-engine-xml&gt;".</value>
         <value xml:lang="zh-TW">本頁面用於匯入匯出的資料實體引擎XML檔.這些檔都有一個根標簽 
"&lt;entity-engine-xml&gt;".&lt;/entity-engine-xml&gt;</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">