svn commit: r1743231 - in /ofbiz/branches/release15.12: ./ applications/content/script/org/ofbiz/content/blog/BlogServices.xml

Author: jleroux
Date: Tue May 10 17:12:55 2016
New Revision: 1743231

URL: http://svn.apache.org/viewvc?rev=1743231&view=rev
Log:
"Applied fix from trunk for revision: 1743230"
------------------------------------------------------------------------
r1743230 | jleroux | 2016-05-10 19:12:05 +0200 (mar. 10 mai 2016) | 3 lignes

A patch from Ingo Wolfmayr for "Update empty blog article text does not work" https://issues.apache.org/jira/browse/OFBIZ-7062

When creating a blog-entry with empty article text, it is not possible to add update the article. Content entry is created but not assigned to contentId of blog-entry. The attached patch fixes this.
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release15.12/   (props changed)
    ofbiz/branches/release15.12/applications/content/script/org/ofbiz/content/blog/BlogServices.xml

Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 10 17:12:55 2016
@@ -9,4 +9,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027
+/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230

Modified: ofbiz/branches/release15.12/applications/content/script/org/ofbiz/content/blog/BlogServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/content/script/org/ofbiz/content/blog/BlogServices.xml?rev=1743231&r1=1743230&r2=1743231&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/content/script/org/ofbiz/content/blog/BlogServices.xml (original)
+++ ofbiz/branches/release15.12/applications/content/script/org/ofbiz/content/blog/BlogServices.xml Tue May 10 17:12:55 2016
@@ -150,19 +150,21 @@
         <!-- new article text -->
         <if-empty field="articleText">
             <if-not-empty field="parameters.articleData">
+                <set field="ownerContentId" from-field="parameters.blogContentId"/>
+                <set field="contentAssocTypeId" value="SUB_CONTENT"/>
+                <set field="contentIdFrom" from-field="contentId"/>
                 <set field="createText.dataResourceTypeId" value="ELECTRONIC_TEXT"/>
                 <set field="createText.contentPurposeTypeId" value="ARTICLE"/>
                 <set field="createText.dataTemplateTypeId" value="NONE"/>
-                <set field="createText.mapKey" value="MAIN"/>
-                <set field="createSummary.ownerContentId" from-field="parameters.contentId"/>
-                <set field="createSummary.contentName" from-field="parameters.contentName" default-value="${contentName}"/>
-                <set field="createSummary.description" from-field="parameters.description" default-value="${description}"/>
-                <set field="createSummary.statusId" from-field="parameters.statusId" default-value="${statusId}"/>
-                <set field="createSummary.contentAssocTypeId" value="SUB_CONTENT"/>
+                <set field="createText.mapKey" value="ARTICLE"/>
+                <set field="createText.ownerContentId" from-field="ownerContentId"/>
+                <set field="createText.contentName" from-field="parameters.contentName"/>
+                <set field="createText.description" from-field="parameters.description"/>
+                <set field="createText.statusId" from-field="parameters.statusId"/>
+                <set field="createText.contentAssocTypeId"  from-field="contentAssocTypeId"/>
                 <set field="createText.textData" from-field="parameters.articleData"/>
                 <set field="createText.contentIdFrom" from-field="contentIdFrom"/>
                 <set field="createText.partyId" from-field="userLogin.partyId"/>
-                <log level="always" message="calling createTextContent with map: ${createText}"/>
                 <call-service service-name="createTextContent" in-map-name="createText"/>
             </if-not-empty>
         </if-empty>