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 2007/09/21 23:17:17 UTC
svn commit: r578278 - in /ofbiz/branches/release4.0:
applications/ecommerce/webapp/ecommerce/includes/
applications/marketing/servicedef/ framework/common/webcommon/includes/
framework/entity/src/org/ofbiz/entity/transaction/ framework/service/dtd/
Author: jleroux
Date: Fri Sep 21 14:17:16 2007
New Revision: 578278
URL: http://svn.apache.org/viewvc?rev=578278&view=rev
Log:
Applied fix from trunk for revision: 573126
Modified:
ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/includes/language.ftl
ofbiz/branches/release4.0/applications/marketing/servicedef/services.xml
ofbiz/branches/release4.0/framework/common/webcommon/includes/language.ftl
ofbiz/branches/release4.0/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java
ofbiz/branches/release4.0/framework/service/dtd/services.xsd
Modified: ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/includes/language.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/includes/language.ftl?rev=578278&r1=578277&r2=578278&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/includes/language.ftl (original)
+++ ofbiz/branches/release4.0/applications/ecommerce/webapp/ecommerce/includes/language.ftl Fri Sep 21 14:17:16 2007
@@ -23,7 +23,7 @@
</div>
<div class="screenlet-body" style="text-align: center;">
<form method="post" name="chooseLanguage" action="<@o...@ofbizUrl>" style="margin: 0;">
- <select name="locale" class="selectBox" style="width:95%">
+ <select name="newLocale" class="selectBox" style="width:95%">
<#list availableLocales as availableLocale>
<#assign langAttr = availableLocale.toString()?replace("_", "-")>
<#assign langDir = "ltr">
Modified: ofbiz/branches/release4.0/applications/marketing/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/marketing/servicedef/services.xml?rev=578278&r1=578277&r2=578278&view=diff
==============================================================================
--- ofbiz/branches/release4.0/applications/marketing/servicedef/services.xml (original)
+++ ofbiz/branches/release4.0/applications/marketing/servicedef/services.xml Fri Sep 21 14:17:16 2007
@@ -348,7 +348,7 @@
<service name="marketingPermissionService" engine="simple"
location="org/ofbiz/common/permission/CommonPermissionServices.xml" invoke="genericBasePermissionCheck">
<implements service="permissionInterface"/>
- <attribute name="primaryPermission" type="String" mode="IN" optional="false" default-value="MARKETING"/>
+ <attribute name="primaryPermission" type="String" mode="IN" optional="true" default-value="MARKETING"/>
<attribute name="altPermission" type="String" mode="IN" optional="true"/>
</service>
</services>
Modified: ofbiz/branches/release4.0/framework/common/webcommon/includes/language.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/framework/common/webcommon/includes/language.ftl?rev=578278&r1=578277&r2=578278&view=diff
==============================================================================
--- ofbiz/branches/release4.0/framework/common/webcommon/includes/language.ftl (original)
+++ ofbiz/branches/release4.0/framework/common/webcommon/includes/language.ftl Fri Sep 21 14:17:16 2007
@@ -37,7 +37,7 @@
<tr>
<td align='center'>
<form method="post" name="chooseLanguage" action="<@o...@ofbizUrl>" style="margin: 0;">
- <select name="locale" class="selectBox">
+ <select name="newLocale" class="selectBox">
<#assign initialDisplayName = locale.getDisplayName(locale)>
<#if 18 < initialDisplayName?length>
<assign initialDisplayName = initialDisplayName[0..15] + "...">
Modified: ofbiz/branches/release4.0/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java?rev=578278&r1=578277&r2=578278&view=diff
==============================================================================
--- ofbiz/branches/release4.0/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java (original)
+++ ofbiz/branches/release4.0/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java Fri Sep 21 14:17:16 2007
@@ -313,7 +313,7 @@
try {
if (TransactionUtil.getStatus() == TransactionUtil.STATUS_ACTIVE) {
TransactionManager txMgr = TransactionFactory.getTransactionManager();
- if (txMgr != null ) {
+ if (txMgr != null) {
pushTransactionBeginStackSave(clearTransactionBeginStack());
pushSetRollbackOnlyCauseSave(clearSetRollbackOnlyCause());
Transaction trans = txMgr.suspend();
Modified: ofbiz/branches/release4.0/framework/service/dtd/services.xsd
URL: http://svn.apache.org/viewvc/ofbiz/branches/release4.0/framework/service/dtd/services.xsd?rev=578278&r1=578277&r2=578278&view=diff
==============================================================================
--- ofbiz/branches/release4.0/framework/service/dtd/services.xsd (original)
+++ ofbiz/branches/release4.0/framework/service/dtd/services.xsd Fri Sep 21 14:17:16 2007
@@ -294,7 +294,9 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
- <xs:attribute type="xs:string" name="default-value"/>
+ <xs:attribute type="xs:string" name="default-value">
+ <xs:annotation><xs:documentation>The value specified will be used for the attribute if no value is passed in. This will only happen if it is okay to not pass a value in, ie if optional=true. If optional=false a value must be passed in so this attribute would be ignored.</xs:documentation></xs:annotation>
+ </xs:attribute>
<xs:attribute type="xs:string" name="form-label"/>
<xs:attribute type="xs:string" name="entity-name"/>
<xs:attribute type="xs:string" name="field-name"/>