You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2008/12/15 23:07:55 UTC
svn commit: r726836 - in /ofbiz/trunk:
applications/content/src/org/ofbiz/content/data/
applications/content/widget/content/ applications/order/widget/ordermgr/
applications/party/widget/partymgr/ framework/common/widget/
Author: jacopoc
Date: Mon Dec 15 14:07:55 2008
New Revision: 726836
URL: http://svn.apache.org/viewvc?rev=726836&view=rev
Log:
Minor formatting fixes.
Modified:
ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml
ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml
ofbiz/trunk/framework/common/widget/CommonScreens.xml
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java?rev=726836&r1=726835&r2=726836&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java Mon Dec 15 14:07:55 2008
@@ -577,8 +577,8 @@
public static void renderDataResourceAsText(GenericDelegator delegator, String dataResourceId, Appendable out,
Map templateContext, Locale locale, String targetMimeTypeId, boolean cache) throws GeneralException, IOException {
if (dataResourceId == null) {
- throw new GeneralException("Cannot lookup data resource with for a null dataResourceId");
- }
+ throw new GeneralException("Cannot lookup data resource with for a null dataResourceId");
+ }
if (templateContext == null) {
templateContext = FastMap.newInstance();
}
@@ -635,9 +635,8 @@
// no template; or template is NONE; render the data
if (UtilValidate.isEmpty(dataTemplateTypeId) || "NONE".equals(dataTemplateTypeId)) {
DataResourceWorker.writeDataResourceText(dataResource, targetMimeTypeId, locale, templateContext, delegator, out, true);
-
- // a template is defined; render the template first
} else {
+ // a template is defined; render the template first
templateContext.put("mimeTypeId", targetMimeTypeId);
// FTL template
Modified: ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml?rev=726836&r1=726835&r2=726836&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml Mon Dec 15 14:07:55 2008
@@ -261,7 +261,7 @@
</form>
<form name="EditDataResourceText" target="updateDataResourceText" title="" type="single" extends="DataResourceMaster"
header-row-style="header-row" default-table-style="basic-table">
- <field name="dataResourceId"><display/></field>
+ <field name="dataResourceId"><hidden/></field>
<field name="dataResourceTypeId"><hidden value="ELECTRONIC_TEXT"/></field>
<field name="dataResourceTypeIdDisplay" title="Type Id" field-name="dataResourceTypeId">
<display description="ELECTRONIC_TEXT" also-hidden="false"/>
@@ -271,7 +271,7 @@
</form>
<form name="EditDataResourceUpload" target="updateDataResourceUpload" title="" type="single" extends="DataResourceMaster"
header-row-style="header-row" default-table-style="basic-table">
- <field name="dataResourceId"><display/></field>
+ <field name="dataResourceId"><hidden/></field>
<field name="dataResourceTypeId"><hidden value="IMAGE_OBJECT"/></field>
<field name="dataResourceTypeIdDisplay" title="Type Id" field-name="dataResourceTypeId">
<display description="IMAGE_OBJECT" also-hidden="false"/>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml?rev=726836&r1=726835&r2=726836&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderEntryCartScreens.xml Mon Dec 15 14:07:55 2008
@@ -29,8 +29,8 @@
<set field="hidebottomlinks" value="Y"/>
</actions>
<widgets>
- <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/cart/minicart.ftl"/></html></platform-specific>
- </widgets>
+ <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/cart/minicart.ftl"/></html></platform-specific>
+ </widgets>
</section>
</screen>
Modified: ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml?rev=726836&r1=726835&r2=726836&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml Mon Dec 15 14:07:55 2008
@@ -43,7 +43,7 @@
<section>
<condition>
<if-has-permission permission="PARTYMGR" action="_GRP_UPDATE"/>
- </condition>
+ </condition>
<widgets>
<screenlet title="${uiLabelMap.PartyPersonalInformation}" navigation-menu-name="personUpdate" id="PartyPersonalInformationPanel">
<include-menu name="personUpdate" location="component://party/widget/partymgr/PartyMenus.xml"/>
Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=726836&r1=726835&r2=726836&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Mon Dec 15 14:07:55 2008
@@ -154,7 +154,7 @@
</section>
<platform-specific><html><html-template location="component://common/webcommon/includes/messages.ftl"/></html></platform-specific>
<container style="contentarea">
- <!-- may be used by sight disabled persons to skip diretly to content area-->
+ <!-- may be used by sight disabled persons to skip directly to content area-->
<decorator-section-include name="pre-body"/>
<!-- Please don't change the column-container id : it's referenced to allow skipping navigation-->
<container id="column-container">