Author: jleroux
Date: Tue Jan 18 19:46:11 2011
New Revision: 1060546
URL:
http://svn.apache.org/viewvc?rev=1060546&view=revLog:
A slightly modified patch from Anil Soni "In Content Manager's CMS sub-module CMSContentFind page doesn't show the content list." (
https://issues.apache.org/jira/browse/OFBIZ-2746) - OFBIZ-2746
This modified patch solves the find issue but not the create. I have simply kept
if (dataResourceId) {
instead of
if (!dataResourceId) {
in CmsEditAddPrep.groovy
because it's an obvious error (NPE the line after else). But it does not solve another error.
Modified:
ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/cms/CmsEditAddPrep.groovy
ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml
Modified: ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/cms/CmsEditAddPrep.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/cms/CmsEditAddPrep.groovy?rev=1060546&r1=1060545&r2=1060546&view=diff==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/cms/CmsEditAddPrep.groovy (original)
+++ ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/cms/CmsEditAddPrep.groovy Tue Jan 18 19:46:11 2011
@@ -90,4 +90,4 @@ persistAction = context.persistAction;
if (!persistAction) {
persistAction = "persistContent";
}
-context.persistAction = persistAction;
+context.persistAction = persistAction;
\ No newline at end of file
Modified: ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml?rev=1060546&r1=1060545&r2=1060546&view=diff==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml Tue Jan 18 19:46:11 2011
@@ -32,19 +32,20 @@ under the License.
<field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="listFindContent" type="list" target="" paginate-target="/CMSContentFind" view-size="20"
+ <form name="listFindContent" type="list" list-name="listIt" target="" paginate-target="/CMSContentFind" view-size="20"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<service service-name="performFind" result-map-list="listIt">
<field-map field-name="inputFields" from-field="requestParameters"/>
<field-map field-name="entityName" from-field="entityName"/>
+ <field-map field-name="noConditionFind" value="Y"/>
<field-map field-name="viewIndex" from-field="viewIndex"/>
<field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
- <field name="editContent" title="${uiLabelMap.CommonEmptyHeader}">
- <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditAddContent">
+ <field name="caContentIdTo" title="${uiLabelMap.CommonEmptyHeader}">
+ <hyperlink also-hidden="false" description="${caContentIdTo}" target="EditAddContent">
<parameter param-name="MASTER_contentId" from-field="contentId"/>
<parameter param-name="MASTER_drDataResourceId" from-field="drDataResourceId"/>
<parameter param-name="MASTER_caContentIdTo" from-field="caContentIdTo"/>
@@ -63,7 +64,6 @@ under the License.
</hyperlink>
-->
</field>
- <field name="caContentIdTo"><display/></field>
<field name="caMapKey"><display/></field>
<field name="caFromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>
<field name="contentId"><display/></field>
Locked
