Author: adrianc
Date: Thu Jan 8 16:08:49 2009
New Revision: 732878
URL: http://svn.apache.org/viewvc?rev=732878&view=rev
Log:
Webtools entity reference now indicates what fields are encrypted.
Internationalization note: this commit contains a new UI label.
Modified:
ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefMain.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefReport.fo.ftl
Modified: ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml?rev=732878&r1=732877&r2=732878&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml (original)
+++ ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.xml Thu Jan 8
16:08:49 2009
@@ -821,6 +821,9 @@
<value xml:lang="th">à¹à¸à¹à¸à¹à¸à¹à¸à¹</value>
<value xml:lang="zh">æ¢å¤</value>
</property>
+ <property key="WebtoolsEncrypted">
+ <value xml:lang="en">Encrypted</value>
+ </property>
<property key="WebtoolsEngineName">
<value xml:lang="en">Engine Name</value>
<value xml:lang="fr">Nom de moteur</value>
Modified:
ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java?rev=732878&r1=732877&r2=732878&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java
(original)
+++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java
Thu Jan 8 16:08:49 2009
@@ -699,6 +699,7 @@
javaNameMap.put("type", (field.getType()) != null
? field.getType() : null);
javaNameMap.put("javaType", (field.getType() !=
null && type != null) ? type.getJavaType() : "Undefined");
javaNameMap.put("sqlType", (type != null &&
type.getSqlType() != null) ? type.getSqlType() : "Undefined");
+ javaNameMap.put("encrypted", field.getEncrypt());
javaNameList.add(javaNameMap);
}
Modified:
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefMain.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefMain.ftl?rev=732878&r1=732877&r2=732878&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefMain.ftl
(original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefMain.ftl Thu
Jan 8 16:08:49 2009
@@ -95,6 +95,9 @@
<#if javaName.description?has_content>
<div
class="descriptiontext">${javaName.description}</div>
</#if>
+ <#if javaName.encrypted>
+ <div
class="descriptiontext">[${uiLabelMap.WebtoolsEncrypted}]</div>
+ </#if>
</td>
<td>${javaName.colName}</td>
<td>${javaName.type}</td>
Modified:
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefReport.fo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefReport.fo.ftl?rev=732878&r1=732877&r2=732878&view=diff
==============================================================================
---
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefReport.fo.ftl
(original)
+++
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefReport.fo.ftl
Thu Jan 8 16:08:49 2009
@@ -106,6 +106,9 @@
<#if javaName.description?has_content>
<fo:block>${javaName.description}</fo:block>
</#if>
+ <#if javaName.encrypted>
+ <fo:block>[${uiLabelMap.WebtoolsEncrypted}]</fo:block>
+ </#if>
</fo:table-cell>
<fo:table-cell padding="2pt">
<fo:block>${javaName.colName}</fo:block>
