svn commit: r568733 - in /ofbiz/trunk/applications/content: config/ContentUiLabels.properties src/org/ofbiz/content/ContentManagementServices.java widget/forum/ForumForms.xml

[adrianc]

Author: adrianc
Date: Wed Aug 22 12:20:41 2007
New Revision: 568733

URL: http://svn.apache.org/viewvc?rev=568733&view=rev
Log:
Some bug fixes for content manager. Add forum/thread/message now works. Update message still doesn't work.

Modified:
    ofbiz/trunk/applications/content/config/ContentUiLabels.properties
    ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java
    ofbiz/trunk/applications/content/widget/forum/ForumForms.xml

Modified: ofbiz/trunk/applications/content/config/ContentUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentUiLabels.properties?rev=568733&r1=568732&r2=568733&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/config/ContentUiLabels.properties (original)
+++ ofbiz/trunk/applications/content/config/ContentUiLabels.properties Wed Aug 22 12:20:41 2007
@@ -227,6 +227,7 @@
 FormFieldTitle_cookieDomain=Cookie Domain
 FormFieldTitle_partyId=Party Id
 FormFieldTitle_roleTypeId=Role Type Id
+FormFieldTitle_caFromDate=From Date & Time
 FormFieldTitle_fromDate=From Date & Time
 FormFieldTitle_thruDate=Thru Date & Time
 FormFieldTitle_surveyId=Survey Id

Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java?rev=568733&r1=568732&r2=568733&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementServices.java Wed Aug 22 12:20:41 2007
@@ -225,7 +225,6 @@
         results.put("contentId", content.get("contentId"));
         results.put("dataResourceId", dataResource.get("dataResourceId"));
         results.put("drDataResourceId", dataResource.get("dataResourceId"));
-        results.put("caContentAssocTypeId", contentAssoc.get("contentAssocTypeId"));
         results.put("drDataResourceId", dataResource.get("dataResourceId"));
         results.put("caContentIdTo", contentAssoc.get("contentIdTo"));
         results.put("caContentId", contentAssoc.get("contentId"));

Modified: ofbiz/trunk/applications/content/widget/forum/ForumForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/ForumForms.xml?rev=568733&r1=568732&r2=568733&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/forum/ForumForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/forum/ForumForms.xml Wed Aug 22 12:20:41 2007
@@ -51,11 +51,11 @@
         <field name="forumGroupId"><hidden value="${parameters.forumGroupId}"/></field>
         <field name="forumName" parameter-name="contentName"><text/></field>
         <field name="forumDescription" parameter-name="description"><text/></field>
-        <field name="fromDate"><date-time/></field>
+        <field name="caFromDate"><date-time/></field>
         <field name="contentTypeId"><hidden value="WEB_SITE_PUB_PT"/></field>
         <field name="ownerContentId"><hidden value="${parameters.forumGroupId}"/></field>
-        <field name="contentIdTo"><hidden value="${parameters.forumGroupId}"/></field>
-        <field name="contentAssocTypeId"><hidden value="SUBSITE"/></field>
+        <field name="caContentIdTo"><hidden value="${parameters.forumGroupId}"/></field>
+        <field name="caContentAssocTypeId"><hidden value="SUBSITE"/></field>
         <field name="addButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     
@@ -149,10 +149,10 @@
         <field name="forumMessageTitle" parameter-name="description"><text/></field>
         <field name="contentTypeId"><hidden/></field>
         <field name="ownerContentId"><hidden value="${parameters.forumId}"/></field>
-        <field name="fromDate"><hidden value="${contentAssoc.fromDate}"/></field>
-        <field name="toDate"><hidden value="${contentAssoc.toDate}"/></field>
-        <field name="contentIdTo"><hidden/></field>
-        <field name="contentAssocTypeId"><hidden value="RESPONSE"/></field>
+        <field name="caFromDate"><hidden value="${contentAssoc.fromDate}"/></field>
+        <field name="caToDate"><hidden value="${contentAssoc.toDate}"/></field>
+        <field name="caContentIdTo"><hidden/></field>
+        <field name="caContentAssocTypeId"><hidden value="RESPONSE"/></field>
         <field name="forumMessageText" parameter-name="textData"><textarea rows="10"/></field>
         <field name="addButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
@@ -166,8 +166,8 @@
         <field name="forumMessageTitle" parameter-name="description"><text default-value="${forumMessage.description}"/></field>
         <field name="contentTypeId"><hidden value="DOCUMENT"/></field>
         <field name="ownerContentId"><hidden value="${parameters.forumId}"/></field>
-        <field name="contentIdTo"><hidden value="${parameters.forumMessageIdTo}"/></field>
-        <field name="contentAssocTypeId"><hidden value="RESPONSE"/></field>
+        <field name="caContentIdTo"><hidden value="${parameters.forumMessageIdTo}"/></field>
+        <field name="caContentAssocTypeId"><hidden value="RESPONSE"/></field>
         <field name="forumMessageText" parameter-name="textData"><textarea rows="10" visual-editor-enable="true" visual-editor-buttons="undo redo bold italic underline bullet indent outdent link"/></field>
         <field name="addButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>