You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2013/02/16 10:23:21 UTC

svn commit: r1446859 [3/5] - in /ofbiz/branches/webhelp-2012-12-07: ./ applications/accounting/config/ applications/accounting/data/ applications/humanres/config/ applications/manufacturing/config/ applications/marketing/config/ applications/order/scri...

Modified: ofbiz/branches/webhelp-2012-12-07/framework/common/config/TemporalExpressionUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/common/config/TemporalExpressionUiLabels.xml?rev=1446859&r1=1446858&r2=1446859&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/framework/common/config/TemporalExpressionUiLabels.xml (original)
+++ ofbiz/branches/webhelp-2012-12-07/framework/common/config/TemporalExpressionUiLabels.xml Sat Feb 16 09:23:20 2013
@@ -137,6 +137,7 @@
         <value xml:lang="it">hh:mm:ss</value>
         <value xml:lang="ja">hh:mm:ss</value>
         <value xml:lang="pt_BR">hh:mm:ss</value>
+        <value xml:lang="zh">HH:mm:ss</value>
     </property>
     <property key="TemporalExpressionType">
         <value xml:lang="de">Ausdruckstyp</value>
@@ -221,6 +222,7 @@
         <value xml:lang="es">Intervalo de horas</value>
         <value xml:lang="ja">時の範囲</value>
         <value xml:lang="pt_BR">Intervalo de Hora</value>
+        <value xml:lang="zh">小时范围</value>
     </property>
     <property key="TemporalExpression_INTERSECTION">
         <value xml:lang="de">Durchschnitt</value>    
@@ -239,6 +241,7 @@
         <value xml:lang="es">Intervalo de minutos</value>
         <value xml:lang="ja">分の範囲</value>
         <value xml:lang="pt_BR">Intervalo de Minutos</value>
+        <value xml:lang="zh">分钟范围</value>
     </property>
     <property key="TemporalExpression_MONTH_RANGE">
         <value xml:lang="de">Monatsauswahl</value>    
@@ -257,6 +260,7 @@
         <value xml:lang="es">Sustitución</value>
         <value xml:lang="ja">代用</value>
         <value xml:lang="pt_BR">Substituição</value>
+        <value xml:lang="zh">替换</value>
     </property>
     <property key="TemporalExpression_UNION">
         <value xml:lang="de">Vereinigung</value>    

Modified: ofbiz/branches/webhelp-2012-12-07/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java?rev=1446859&r1=1446858&r2=1446859&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java (original)
+++ ofbiz/branches/webhelp-2012-12-07/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java Sat Feb 16 09:23:20 2013
@@ -32,6 +32,7 @@ import org.ofbiz.base.config.GenericConf
 import org.ofbiz.base.config.MainResourceHandler;
 import org.ofbiz.base.config.ResourceHandler;
 import org.ofbiz.base.util.Debug;
+import org.ofbiz.base.util.UtilProperties;
 import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.entity.Delegator;
 import org.ofbiz.entity.GenericEntityException;
@@ -99,6 +100,11 @@ public class EntityDataLoader {
                     throw new IllegalArgumentException("Reader name list does not contain String(s) or Element(s)");
                 }
                 readerName = readerName.trim();
+                
+                // ignore the "tenant" reader if the multitenant property is "N"
+                if ("tenant".equals(readerName) && "N".equals(UtilProperties.getPropertyValue("general.properties", "multitenant"))) {
+                    continue;
+                }
 
                 // get all of the main resource model stuff, ie specified in the entityengine.xml file
                 EntityDataReaderInfo entityDataReaderInfo = EntityConfigUtil.getEntityDataReaderInfo(readerName);
@@ -200,6 +206,12 @@ public class EntityDataLoader {
             } else {
                 throw new IllegalArgumentException("Reader name list does not contain String(s) or Element(s)");
             }
+            
+            // ignore the "tenant" reader if the multitenant property is "N"
+            if ("tenant".equals(readerName) && "N".equals(UtilProperties.getPropertyValue("general.properties", "multitenant"))) {
+                continue;
+            }
+            
             readerNames.add(readerName);
         }
         return getUrlByComponentList(helperName, components, readerNames);

Modified: ofbiz/branches/webhelp-2012-12-07/framework/entityext/config/EntityExtUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/entityext/config/EntityExtUiLabels.xml?rev=1446859&r1=1446858&r2=1446859&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/framework/entityext/config/EntityExtUiLabels.xml (original)
+++ ofbiz/branches/webhelp-2012-12-07/framework/entityext/config/EntityExtUiLabels.xml Sat Feb 16 09:23:20 2013
@@ -23,100 +23,120 @@
         <value xml:lang="en">Cannot do Entity Sync Push because entitySyncId [] is set for Pull Only.</value>
         <value xml:lang="fr">Impossible d'effectuer la synchro (push) avec un configuration en mode esclave seulement (pull only).</value>
         <value xml:lang="it">Non è possibile fare Entity Sync Push perchè entitySyncId [] è impostato in Pull Only.</value>
+        <value xml:lang="zh">无法实现实体同步推送因为实体同步标识（entitySyncId []）被设置为了只能提取。</value>
     </property>
     <property key="EntityExtCannotFindDelegator">
         <value xml:lang="en">Could not find delegator with specified name ${overrideDelegatorName}</value>
         <value xml:lang="fr">Le delegateur avec le nom ${overrideDelegatorName} n'a pu être trouvé</value>
         <value xml:lang="it">Could not find delegator with specified name ${overrideDelegatorName}</value>
+        <value xml:lang="zh">无法找到名称为${overrideDelegatorName}的代理</value>
     </property>
     <property key="EntityExtEntitySyncXMLDocumentIsNotValid">
         <value xml:lang="en">EntitySync XML document ${fileName} is not valid!</value>
         <value xml:lang="fr">L'EntitySync XML document ${fileName} n'est pas valide !</value>
         <value xml:lang="it">EntitySync XML documento ${fileName} non è valido!</value>
+        <value xml:lang="zh">实体同步（EntitySync）XML文档${fileName}无效！</value>
     </property>
     <property key="EntityExtErrorCallingRemotePull">
         <value xml:lang="en">Error calling remote pull and report EntitySync service with name: ${remotePullAndReportEntitySyncDataName}</value>
         <value xml:lang="fr">Erreur lors de l'appel de l'esclave (remote pull) et de son rapport sur le service nommé : ${remotePullAndReportEntitySyncDataName}</value>
         <value xml:lang="it">Errore durante la chiamata del pull remoto e report EntitySync servizio con il nome: ${remotePullAndReportEntitySyncDataName}</value>
+        <value xml:lang="zh">调用远程提取和报表的实体同步（EntitySync）服务时出错，服务名称：${remotePullAndReportEntitySyncDataName}</value>
     </property>
     <property key="EntityExtErrorCallingService">
         <value xml:lang="en">Error calling service to store data locally</value>
         <value xml:lang="fr">Erreur d'appel du service de mise à jour des données locales</value>
         <value xml:lang="it">Errore durante la chiamata del servizio di registrazione locale dei dati</value>
+        <value xml:lang="zh">调用服务来本地存储数据时出错</value>
     </property>
     <property key="EntityExtErrorCleaningEntitySyncRemove">
         <value xml:lang="en">Error cleaning out EntitySyncRemove info: ${errorString}</value>
         <value xml:lang="fr">Erreur lors du nettoyage des EntitySyncRemove, plus d'informations : ${errorString}</value>
         <value xml:lang="it">Error cleaning out EntitySyncRemove info: ${errorString}</value>
+        <value xml:lang="zh">清除实体同步删除（EntitySyncRemove）信息时出错：${errorString}</value>
     </property>
     <property key="EntityExtErrorGettingListOfEntityInGroup">
         <value xml:lang="en">Error getting list of entities in group: ${errorString}</value>
         <value xml:lang="fr">Erreur lors de la récupération des entités du group : ${errorString}</value>
         <value xml:lang="it">Errore ad ottenere la lista delle entità nel gruppo: ${errorString}</value>
+        <value xml:lang="zh">获取分组中的实体列表时出错：${errorString}</value>
     </property>
     <property key="EntityExtErrorUnwrappingRecords">
         <value xml:lang="en">Error unwrapping ByteWrapper records: ${errorString}</value>
         <value xml:lang="fr">Erreur lors de l"ouverture du flux des enregistrements : ${errorString}</value>
         <value xml:lang="it">Errore unwrapping ByteWrapper records: ${errorString}</value>
+        <value xml:lang="zh">解析ByteWrapper记录时出错：${errorString}</value>
     </property>
     <property key="EntityExtErrorSavingEntitySyncData">
         <value xml:lang="en">Error saving Entity Sync Data for entitySyncId ${entitySyncId}: ${errorString}</value>
         <value xml:lang="fr">Erreur lors de la synchro de donnée pour la référence ${entitySyncId}: ${errorString}</value>
         <value xml:lang="it">Errore durante il salvataggio Entity Sync Data per entitySyncId ${entitySyncId}: ${errorString}</value>
+        <value xml:lang="zh">为实体同步标识（entitySyncId）${entitySyncId}保存实体同步数据时出错：${errorString}</value>
     </property>
     <property key="EntityExtExceptionSavingEntitySyncData">
         <value xml:lang="en">Exception saving Entity Sync Data for entitySyncId ${entitySyncId}: ${errorString}</value>
         <value xml:lang="fr">Exception lors de l'enregistrement de la synchro de donnée pour la référence ${entitySyncId}: ${errorString}</value>
         <value xml:lang="it">Eccezione durante il salvataggio Entity Sync Data per entitySyncId ${entitySyncId}: ${errorString}</value>
+        <value xml:lang="zh">为实体同步标识（entitySyncId）${entitySyncId}保存实体同步数据时出现意外：${errorString}</value>
     </property>
     <property key="EntityExtFileNotFound">
         <value xml:lang="en">File not found: ${fileName}</value>
         <value xml:lang="fr">Fichier ${fileName} non trouvé</value>
         <value xml:lang="it">File non trovato: ${fileName}</value>
+        <value xml:lang="zh">没有找到文件：${fileName}</value>
     </property>
     <property key="EntityExtNoFileAvailableInTheRootDirectory">
         <value xml:lang="en">No files available for reading in this root directory: ${rootDirectory}</value>
         <value xml:lang="fr">Aucun fichier disponible pour la lecture dans le répertoire ${rootDirectory}</value>
         <value xml:lang="it">Nessun file disponibile da leggere nella directory principale: ${rootDirectory}</value>
+        <value xml:lang="zh">这个根目录下没有可读的文件：${rootDirectory}</value>
     </property>
     <property key="EntityExtOfflineXMLFileNotFound">
         <value xml:lang="en">Offline EntitySync XML file not found (${fileName})</value>
         <value xml:lang="fr">Le fichier hors ligne (${fileName}) n'a pas été trouvé</value>
         <value xml:lang="it">File Offline EntitySync XML non trovato (${fileName})</value>
+        <value xml:lang="zh">没有找到离线实体同步（EntitySync）XML文件（${fileName}）</value>
     </property>
     <property key="EntityExtProblemReadingFile">
         <value xml:lang="en">Problem reading file: ${fileName}</value>
         <value xml:lang="fr">Problème lors de la lecture du fichier ${fileName}</value>
         <value xml:lang="it">Problema durante la lettura del file: ${fileName}</value>
+        <value xml:lang="zh">读文件时出问题：${fileName}</value>
     </property>
     <property key="EntityExtRootDirectoryDoesNotExists">
         <value xml:lang="en">Root directory does not exist or is not readable.</value>
         <value xml:lang="fr">Le répertoire racine n'existe pas ou n'est pas lisible</value>
         <value xml:lang="it">Directory principale non esiste o non è leggibile.</value>
+        <value xml:lang="zh">根目录不存在或不可读。</value>
     </property>
     <property key="EntityExtServicePermissionNotGranted">
         <value xml:lang="en">You do not have permission to run this service.</value>
         <value xml:lang="fr">Vous n'avez pas la permission d'exécuter ce service</value>
         <value xml:lang="it">Tu non hai il permesso di eseguire questo servizio.</value>
+        <value xml:lang="zh">你没有权限运行这个服务。</value>
     </property>
     <property key="EntityExtThisServiceIsNotYetImplemented">
         <value xml:lang="en">This service is not implemented yet.</value>
         <value xml:lang="fr">Ce service n'est pas implémenté actuellement</value>
         <value xml:lang="it">Questo servizio non è ancora implementato.</value>
+        <value xml:lang="zh">这个服务尚未实现。</value>
     </property>
     <property key="EntityExtUnableToLoadXMLDocument">
         <value xml:lang="en">Unable to load EntitySync XML ${entitySyncId} - Problem at '${startTime}' Error: ${errorString}</value>
         <value xml:lang="fr">Impossible de charger l'EntitySync XML ${entitySyncId} - Problème à '${startTime}' , avec l'erreur suivante : ${errorString}</value>
         <value xml:lang="it">Non è possibile caricare il EntitySync XML ${entitySyncId} - Problema alle '${startTime}' Errore: ${errorString}</value>
+        <value xml:lang="zh">无法载入实体同步（EntitySync）XML ${entitySyncId} - 问题发生在'${startTime}'，错误：${errorString}</value>
     </property>
     <property key="EntityExtUnableToLocateRootDirectory">
         <value xml:lang="en">Unable to locate root directory ${rootDirectory}</value>
         <value xml:lang="fr">Impossible de localiser le répertoire racine ${rootDirectory}</value>
         <value xml:lang="it">Non è possibile localizzare la directory principale ${rootDirectory}</value>
+        <value xml:lang="zh">无法定位根目录${rootDirectory}</value>
     </property>
     <property key="EntityExtUnableToLocateRootDirectoryURI">
         <value xml:lang="en">Unable to get root directory URI</value>
         <value xml:lang="fr">Impossible de récupérer le répertoire racine</value>
         <value xml:lang="it">Non è possibile localizzare la directory principale URI</value>
+        <value xml:lang="zh">不能得到根目录URI</value>
     </property>
 </resource>

Modified: ofbiz/branches/webhelp-2012-12-07/framework/minilang/config/DefaultMessages.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/minilang/config/DefaultMessages.xml?rev=1446859&r1=1446858&r2=1446859&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/framework/minilang/config/DefaultMessages.xml (original)
+++ ofbiz/branches/webhelp-2012-12-07/framework/minilang/config/DefaultMessages.xml Sat Feb 16 09:23:20 2013
@@ -25,6 +25,7 @@
         <value xml:lang="it">Errore: </value>
         <value xml:lang="ja">エラー:</value>
         <value xml:lang="nl">Fout: </value>     
+        <value xml:lang="zh">错误：</value>
     </property>
     <property key="check.error.suffix">
         <value xml:lang="en">&#160;</value>
@@ -56,6 +57,7 @@
         <value xml:lang="it">Errore: </value>
         <value xml:lang="ja">エラー:</value>
         <value xml:lang="nl">Fout: </value>     
+        <value xml:lang="zh">错误：</value>
     </property>
     <property key="service.error.suffix">
         <value xml:lang="en">&#160;</value>

Modified: ofbiz/branches/webhelp-2012-12-07/framework/minilang/config/MiniLangErrorUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/minilang/config/MiniLangErrorUiLabels.xml?rev=1446859&r1=1446858&r2=1446859&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/framework/minilang/config/MiniLangErrorUiLabels.xml (original)
+++ ofbiz/branches/webhelp-2012-12-07/framework/minilang/config/MiniLangErrorUiLabels.xml Sat Feb 16 09:23:20 2013
@@ -49,6 +49,7 @@
         <value xml:lang="en">calling service ${serviceName} in ${methodName}</value>
         <value xml:lang="it">eseguendo il servizio ${serviceName} in ${methodName}</value>
         <value xml:lang="ja">サービス ${serviceName} を ${methodName} で呼び出し</value>
+        <value xml:lang="zh">在${methodName}中调用服务${serviceName} </value>
     </property>
     <property key="simpleMethod.must_logged_process">
         <value xml:lang="de">Sie müssen am System angemeldet sein um [${shortDescription}] auszuführen</value>

Modified: ofbiz/branches/webhelp-2012-12-07/framework/widget/src/org/ofbiz/widget/form/ModelForm.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/widget/src/org/ofbiz/widget/form/ModelForm.java?rev=1446859&r1=1446858&r2=1446859&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/framework/widget/src/org/ofbiz/widget/form/ModelForm.java (original)
+++ ofbiz/branches/webhelp-2012-12-07/framework/widget/src/org/ofbiz/widget/form/ModelForm.java Sat Feb 16 09:23:20 2013
@@ -3028,17 +3028,38 @@ public class ModelForm extends ModelWidg
         }
 
         public void renderStartString(Appendable writer, Map<String, Object> context, FormStringRenderer formStringRenderer) throws IOException {
-            if (modelForm.fieldGroupList.size() > 0) {
-                formStringRenderer.renderFieldGroupOpen(writer, context, this);
+            if (!modelForm.fieldGroupList.isEmpty()) {
+                if (shouldUse(context)) {
+                    formStringRenderer.renderFieldGroupOpen(writer, context, this);
+                }
             }
             formStringRenderer.renderFormatSingleWrapperOpen(writer, context, modelForm);
         }
 
         public void renderEndString(Appendable writer, Map<String, Object> context, FormStringRenderer formStringRenderer) throws IOException {
             formStringRenderer.renderFormatSingleWrapperClose(writer, context, modelForm);
-            if (modelForm.fieldGroupList.size() > 0) {
-                formStringRenderer.renderFieldGroupClose(writer, context, this);
+            if (!modelForm.fieldGroupList.isEmpty()) {
+                if (shouldUse(context)) {
+                    formStringRenderer.renderFieldGroupClose(writer, context, this);
+                }
+            }
+        }
+
+        public boolean shouldUse(Map<String, Object> context) {
+            for (String fieldName : modelForm.fieldGroupMap.keySet()) {
+                FieldGroupBase group = modelForm.fieldGroupMap.get(fieldName);
+                if (group instanceof FieldGroup) {
+                    FieldGroup fieldgroup =(FieldGroup) group;
+                    if (this.id.equals(fieldgroup.getId())) {
+                        for (ModelFormField modelField : modelForm.fieldList) {
+                            if (fieldName.equals(modelField.getName()) && modelField.shouldUse(context)) {
+                                return true;
+                            }
+                        }
+                    }
+                }
             }
+            return false;
         }
     }