Author: jacopoc
Date: Wed Jul 16 07:21:15 2014
New Revision: 1610919
URL: http://svn.apache.org/r1610919
Log:
Applied fix from trunk for revision: 1610918
===
Fixed miscellaneous errors spotted while reviewing the logs generated by the
ArtifactInfo tool.
Modified:
ofbiz/branches/release13.07/ (props changed)
ofbiz/branches/release13.07/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml
ofbiz/branches/release13.07/applications/accounting/widget/AgreementScreens.xml
ofbiz/branches/release13.07/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomSimpleMethods.xml
ofbiz/branches/release13.07/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml
ofbiz/branches/release13.07/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
ofbiz/branches/release13.07/framework/common/webcommon/WEB-INF/portal-controller.xml
ofbiz/branches/release13.07/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java
Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1610918
Modified:
ofbiz/branches/release13.07/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml?rev=1610919&r1=1610918&r2=1610919&view=diff
==============================================================================
---
ofbiz/branches/release13.07/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml
(original)
+++
ofbiz/branches/release13.07/applications/accounting/script/org/ofbiz/accounting/agreement/AgreementServices.xml
Wed Jul 16 07:21:15 2014
@@ -100,12 +100,12 @@ under the License.
</iterate>
</if-compare>
<if-compare field="parameters.copyAgreementFacilities" value="Y"
operator="equals">
- <get-related value-field="agreement"
relation-name="AgreementFaclityAppl" list="agreementFaclityAppls"/>
- <iterate list="agreementFaclityAppls" entry="agreementFaclityAppl">
- <clear-field field="createAgreementFaclityApplInMap"/>
- <set-service-fields service-name="createAgreementFaclityAppl"
to-map="createAgreementFaclityApplInMap" map="agreementFaclityAppl"/>
- <set from-field="agreementIdTo"
field="createAgreementFaclityApplInMap.agreementId"/>
- <call-service service-name="createAgreementFaclityAppl"
in-map-name="createAgreementFaclityApplInMap"/>
+ <get-related value-field="agreement"
relation-name="AgreementFacilityAppl" list="agreementFacilityAppls"/>
+ <iterate list="agreementFacilityAppls"
entry="agreementFacilityAppl">
+ <clear-field field="createAgreementFacilityApplInMap"/>
+ <set-service-fields service-name="createAgreementFacilityAppl"
to-map="createAgreementFacilityApplInMap" map="agreementFacilityAppl"/>
+ <set from-field="agreementIdTo"
field="createAgreementFacilityApplInMap.agreementId"/>
+ <call-service service-name="createAgreementFacilityAppl"
in-map-name="createAgreementFacilityApplInMap"/>
</iterate>
</if-compare>
<if-compare field="parameters.copyAgreementParties" value="Y"
operator="equals">
Modified:
ofbiz/branches/release13.07/applications/accounting/widget/AgreementScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/accounting/widget/AgreementScreens.xml?rev=1610919&r1=1610918&r2=1610919&view=diff
==============================================================================
---
ofbiz/branches/release13.07/applications/accounting/widget/AgreementScreens.xml
(original)
+++
ofbiz/branches/release13.07/applications/accounting/widget/AgreementScreens.xml
Wed Jul 16 07:21:15 2014
@@ -485,9 +485,6 @@ under the License.
<screenlet
title="${uiLabelMap.AccountingAgreementItem}">
<include-form
name="ViewAgreementItemInfoForReport"
location="component://accounting/widget/AgreementForms.xml"/>
</screenlet>
- <screenlet
title="${uiLabelMap.AccountingAgreementItemFacilitiesForReport}">
- <include-form
name="ListAgreementItemFacilitiesForReport"
location="component://accounting/widget/AgreementForms.xml"/>
- </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
Modified:
ofbiz/branches/release13.07/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomSimpleMethods.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomSimpleMethods.xml?rev=1610919&r1=1610918&r2=1610919&view=diff
==============================================================================
---
ofbiz/branches/release13.07/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomSimpleMethods.xml
(original)
+++
ofbiz/branches/release13.07/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomSimpleMethods.xml
Wed Jul 16 07:21:15 2014
@@ -25,7 +25,6 @@ under the License.
<if-empty field="parameters.fromDate">
<now-timestamp field="parameters.fromDate"/>
</if-empty>
- <set field="" from-field=""/>
<set field="searchDuplicatedAncestorContext.productId"
from-field="parameters.productId"/>
<set field="searchDuplicatedAncestorContext.productIdTo"
from-field="parameters.productIdTo"/>
Modified:
ofbiz/branches/release13.07/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml?rev=1610919&r1=1610918&r2=1610919&view=diff
==============================================================================
---
ofbiz/branches/release13.07/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml
(original)
+++
ofbiz/branches/release13.07/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml
Wed Jul 16 07:21:15 2014
@@ -139,7 +139,7 @@
<set-service-fields service-name="updatePartyRelationship"
map="partyRelationship" to-map="deletePartyRelationship"/>
<set from-field="nowTimestamp"
field="deletePartyRelationship.thruDate"/>
<call-service service-name="updatePartyRelationship"
in-map-name="deletePartyRelationship"/>
- <log level="info" message="Expiring relationship
${deletePartyRelationship}"> </log>
+ <log level="info" message="Expiring relationship
${deletePartyRelationship}"/>
<clear-field field="deletePartyRelationship"/>
<clear-field field="partyRelationship"/>
</if-not-empty>
Modified:
ofbiz/branches/release13.07/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml?rev=1610919&r1=1610918&r2=1610919&view=diff
==============================================================================
---
ofbiz/branches/release13.07/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
(original)
+++
ofbiz/branches/release13.07/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
Wed Jul 16 07:21:15 2014
@@ -947,8 +947,7 @@ under the License.
- editPicklistItem
-->
<simple-method method-name="editPicklistItem" short-description="Edit a
Picklist Item">
- <log level="info"><string>Edit a Picklist Item</string></log>
-
+
<make-value value-field="lookupPKMap" entity-name="PicklistItem"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
<find-by-primary-key map="lookupPKMap" value-field="picklistItem"/>
Modified:
ofbiz/branches/release13.07/framework/common/webcommon/WEB-INF/portal-controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/common/webcommon/WEB-INF/portal-controller.xml?rev=1610919&r1=1610918&r2=1610919&view=diff
==============================================================================
---
ofbiz/branches/release13.07/framework/common/webcommon/WEB-INF/portal-controller.xml
(original)
+++
ofbiz/branches/release13.07/framework/common/webcommon/WEB-INF/portal-controller.xml
Wed Jul 16 07:21:15 2014
@@ -21,7 +21,10 @@ under the License.
<site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd";>
<description>Portal ControlServlet Configuration File</description>
-
+
+ <request-map uri="main">
+ <response name="success" type="view" value="showPortalPage"/>
+ </request-map>
<!-- Portlet show requests -->
<request-map uri="showPortlet">
<security https="true" auth="true"/>
Modified:
ofbiz/branches/release13.07/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java?rev=1610919&r1=1610918&r2=1610919&view=diff
==============================================================================
---
ofbiz/branches/release13.07/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java
(original)
+++
ofbiz/branches/release13.07/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java
Wed Jul 16 07:21:15 2014
@@ -121,7 +121,7 @@ public class ServiceArtifactInfo extends
}
protected void populateEntitiesFromNameSet(Set<String> allEntityNameSet)
throws GeneralException {
for (String entityName: allEntityNameSet) {
- if (entityName.contains("${")) {
+ if (UtilValidate.isEmail(entityName) || entityName.contains("${"))
{
continue;
}
// attempt to convert relation names to entity names
