Author: pranayp
Date: Wed Jun 29 12:35:41 2016
New Revision: 1750625
URL: http://svn.apache.org/viewvc?rev=1750625&view=rev
Log:
Applied fix from trunk for revision: 1750624
===
[OFBIZ-7554] Fixed issues with Forum Screens Delete and Update buttons.
Issues fixed are:
- Forum list on Forum Group View
-- Delete button is not showing up and working.
-- Update button is not working.
- Forum Group Roles
-- Delete button is not showing up and working.
- Messages for Forum View
-- Delete button is not showing up and working.
-- Update button is not working.
Thanks Mohammed Rehan Khan for reporting the issue and providing the patch.
Modified:
ofbiz/branches/release15.12/ (props changed)
ofbiz/branches/release15.12/applications/content/src/org/ofbiz/content/ContentManagementServices.java
ofbiz/branches/release15.12/applications/content/widget/forum/ForumForms.xml
Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 29 12:35:41 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,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,1744662,1744768,1744773,1744873,1744911,1745111,1745264,1745428,1745438,1745573,1745577,1745592,1745751,1746228,
1746422,1746459,1746524,1746527,1746536,1746601,1746676,1746714,1746755,1746805,1746832,1746890,1747223,1747349,1747498,1747639,1747642,1747646,1747650,1747661,1747956,1747959,1747963,1748121,1748133,1748206,1748218,1748223,1748260,1748357,1748394,1748401,1748543,1748559,1748628,1748689,1748693,1748703,1748837,1748854,1748907,1748925,1748929,1748944,1748972,1749026,1749083,1749092,1749111,1749220,1749282,1749519,1749525,1749543,1749546,1749552,1749704,1750045,1750166,1750336,1750555
+/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,1743411-1743412,1743656,1743937,1744117,1744198,1744396,1744662,1744768,1744773,1744873,1744911,1745111,1745264,1745428,1745438,1745573,1745577,1745592,1745751,1746228,
1746422,1746459,1746524,1746527,1746536,1746601,1746676,1746714,1746755,1746805,1746832,1746890,1747223,1747349,1747498,1747639,1747642,1747646,1747650,1747661,1747956,1747959,1747963,1748121,1748133,1748206,1748218,1748223,1748260,1748357,1748394,1748401,1748543,1748559,1748628,1748689,1748693,1748703,1748837,1748854,1748907,1748925,1748929,1748944,1748972,1749026,1749083,1749092,1749111,1749220,1749282,1749519,1749525,1749543,1749546,1749552,1749704,1750045,1750166,1750336,1750555,1750624
Modified:
ofbiz/branches/release15.12/applications/content/src/org/ofbiz/content/ContentManagementServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/content/src/org/ofbiz/content/ContentManagementServices.java?rev=1750625&r1=1750624&r2=1750625&view=diff
==============================================================================
---
ofbiz/branches/release15.12/applications/content/src/org/ofbiz/content/ContentManagementServices.java
(original)
+++
ofbiz/branches/release15.12/applications/content/src/org/ofbiz/content/ContentManagementServices.java
Wed Jun 29 12:35:41 2016
@@ -412,9 +412,11 @@ public class ContentManagementServices {
} else {
if (deactivateExisting) {
contentAssocExisting.put("thruDate",
UtilDateTime.nowTimestamp());
+ } else if
(UtilValidate.isNotEmpty(context.get("thruDate"))) {
+ contentAssocExisting.put("thruDate",
(Timestamp)context.get("thruDate"));
}
ModelService contentAssocModel =
dispatcher.getDispatchContext().getModelService("updateContentAssoc");
- Map<String, Object> ctx =
contentAssocModel.makeValid(contentAssoc, "IN");
+ Map<String, Object> ctx =
contentAssocModel.makeValid(contentAssocExisting, "IN");
contentAssocContext.putAll(ctx);
thisResult = dispatcher.runSync("updateContentAssoc",
contentAssocContext);
String errMsg = ServiceUtil.getErrorMessage(thisResult);
Modified:
ofbiz/branches/release15.12/applications/content/widget/forum/ForumForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/content/widget/forum/ForumForms.xml?rev=1750625&r1=1750624&r2=1750625&view=diff
==============================================================================
---
ofbiz/branches/release15.12/applications/content/widget/forum/ForumForms.xml
(original)
+++
ofbiz/branches/release15.12/applications/content/widget/forum/ForumForms.xml
Wed Jun 29 12:35:41 2016
@@ -42,8 +42,9 @@ under the License.
<form name="ListForums" type="list" list-name="forums"
separate-columns="true" target="updateForum"
odd-row-style="alternate-row" header-row-style="header-row-2"
default-table-style="basic-table hover-bar">
<field name="forumGroupId"><hidden
value="${parameters.forumGroupId}"/></field>
- <field name="contentIdTo"><hidden value="${caContentIdTo}"/></field>
- <field name="contentAssocTypeId"><hidden
value="${caContentAssocTypeId}"/></field>
+ <field name="caContentId"><hidden value="${caContentId}"/></field>
+ <field name="caContentIdTo"><hidden value="${caContentIdTo}"/></field>
+ <field name="caContentAssocTypeId"><hidden
value="${caContentAssocTypeId}"/></field>
<field name="contentTypeId"><hidden/></field>
<field name="select" widget-style="buttontext" entry-name="contentId"
parameter-name="contentId">
<hyperlink target="findForumMessages"
description="${uiLabelMap.ContentForumMessages}">
@@ -56,16 +57,16 @@ under the License.
<field name="thruDate" entry-name="caThruDate"><date-time/></field>
<field name="updateButton" title="${uiLabelMap.CommonUpdate}"
widget-style="buttontext"><submit button-type="text-link"/></field>
<field name="deleteButton" title="${uiLabelMap.CommonDelete}"
widget-style="buttontext">
- <hyperlink target="updateForum">
+ <hyperlink target="updateForum"
description="${uiLabelMap.CommonDelete}">
<parameter param-name="forumGroupId"
from-field="parameters.forumGroupId"/>
- <parameter param-name="contentIdTo"
from-field="parameters.forumGroupId"/>
- <parameter param-name="contentId"/>
- <parameter param-name="contentAssocTypeId"
from-field="caContentAssocTypeId"/>
- <parameter param-name="fromDate" from-field="caFromDate"/>
- <parameter param-name="deactivateExisting" value="yes"/>
+ <parameter param-name="caContentIdTo" from-field="contentId"/>
+ <parameter param-name="caContentId"/>
+ <parameter param-name="caContentAssocTypeId"
from-field="caContentAssocTypeId"/>
+ <parameter param-name="caFromDate" from-field="caFromDate"/>
+ <parameter param-name="deactivateExisting" value="true"/>
</hyperlink>
</field>
- <field name="fromDate" entry-name="caFromDate"><display
description="${groovy:caFromDate.toString().substring(0,10)}"/></field>
+ <field name="caFromDate" entry-name="caFromDate"><display
description="${groovy:caFromDate.toString().substring(0,10)}"/></field>
<field name="nbrOfMessages"
entry-name="childBranchCount"><display/></field>
</form>
<form name="AddForum" type="single" target="createForum"
@@ -110,14 +111,16 @@ under the License.
<field name="roleTypeId"><display-entity
entity-name="RoleType"/></field>
<field name="fromDate"><display/></field>
<field name="updateButton" title="${uiLabelMap.CommonUpdate}"><submit
button-type="text-link"/></field>
- <field name="deleteButton"
title="${uiLabelMap.CommonDelete}"><hyperlink target="deleteForumGroupRole">
- <parameter param-name="forumGroupId"/>
+ <field name="deleteButton" title="${uiLabelMap.CommonDelete}">
+ <hyperlink target="deleteForumGroupRole"
description="${uiLabelMap.CommonDelete}">
+ <parameter param-name="forumGroupId"
from-field="parameters.forumGroupId"/>
<parameter param-name="contentIdTo"/>
<parameter param-name="contentId"/>
<parameter param-name="partyId"/>
<parameter param-name="roleTypeId"/>
<parameter param-name="fromDate"/>
- </hyperlink></field>
+ </hyperlink>
+ </field>
</form>
<form name="AddForumGroupRole" type="single" target="createForumGroupRole"
default-map-name=""
header-row-style="header-row" default-table-style="basic-table">
@@ -148,18 +151,22 @@ under the License.
<field name="contentAssocTypeId"><hidden
value="${caContentAssocTypeId}"/></field>
<field name="contentTypeId"><hidden/></field>
<field name="dataResourceTypeId"><hidden
value="ELECTRONIC_TEXT"/></field>
+ <field name="dataResourceId"><hidden
value="${dataResourceId}"/></field>
<field name="messageTitle" entry-name="description"
parameter-name="description"><display/></field>
<field name="createdBy"
entry-name="createdByUserLogin"><display/></field>
<field name="fromDate" entry-name="caFromDate"><display
description="${groovy:caFromDate!=null?caFromDate.toString().substring(0,10):""}"/></field>
<field name="thruDate" entry-name="caThruDate"><display
description="${groovy:caThruDate!=null?caThruDate.toString().substring(0,10):""}"/></field>
- <field name="deleteButton" title="${uiLabelMap.CommonDelete}"
widget-style="buttontext"><hyperlink target="updateForumMessage">
- <parameter param-name="forumGroupId"/>
- <parameter param-name="forumId"/>
- <parameter param-name="contentIdTo"/>
- <parameter param-name="contentId"/>
- <parameter param-name="contentAssocTypeId"/>
- <parameter param-name="fromDate"/>
- </hyperlink></field>
+ <field name="deleteButton" title="${uiLabelMap.CommonDelete}"
widget-style="buttontext">
+ <hyperlink target="updateForumMessage"
description="${uiLabelMap.CommonDelete}">
+ <parameter param-name="forumGroupId"
from-field="parameters.forumGroupId"/>
+ <parameter param-name="forumId"
from-field="${parameters.forumId}"/>
+ <parameter param-name="caContentIdTo"/>
+ <parameter param-name="caContentId"/>
+ <parameter param-name="caContentAssocTypeId"/>
+ <parameter param-name="caFromDate"/>
+ <parameter param-name="deactivateExisting" value="true"/>
+ </hyperlink>
+ </field>
<field name="messageText"
entry-name="contentData.resultData.electronicText.textData"
parameter-name="textData"><textarea rows="8"/></field>
<field name="updateButton" title="${uiLabelMap.CommonUpdate}"
widget-style="buttontext"><submit button-type="text-link"/></field>
<field name="responseButton"
title="${uiLabelMap.FormFieldTitle_reponse}" widget-style="buttontext">
