Never mind, Vivek sent me a patch and I've applied it in r912081 :-) Regards Scott
On 19/02/2010, at 11:10 PM, Scott Gray wrote: > Hi Ashish, > > The view entity definition results in an additional warning (actually info > but they should probably be changed to warnings) at start up: > [java] 2010-02-19 20:58:36,544 (main) [ ModelViewEntity.java:690:INFO ] > Throwing out field alias in view entity ContentAssocAndContentPurpose because > one already exists with the alias name [sequenceNum] and field name > [CNTP(ContentPurpose).sequenceNum], existing field name is [CNTA.sequenceNum] > > Thanks > Scott > > HotWax Media > http://www.hotwaxmedia.com > > On 19/02/2010, at 3:27 AM, ash...@apache.org wrote: > >> Author: ashish >> Date: Fri Feb 19 10:27:10 2010 >> New Revision: 911774 >> >> URL: http://svn.apache.org/viewvc?rev=911774&view=rev >> Log: >> Applied patch from jira issue - OFBIZ-3487 - Improvement on CMS component. >> 1. Adding sequenceNum field on ContentPurpose entity. >> 2. Adding ContentAssocAndContentPurpose view entity. >> 3. Fixed NPE issue on WebSiteCMSContent.ftl file. >> 4. Created ContentPurposeType data for "LANDING_PAGE_IMAGE". >> >> Thanks Amit & Vivek for the contribution >> >> Modified: >> ofbiz/trunk/applications/content/data/ContentOperationData.xml >> ofbiz/trunk/applications/content/entitydef/entitymodel.xml >> ofbiz/trunk/applications/content/servicedef/services_content.xml >> >> ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSContent.ftl >> ofbiz/trunk/applications/content/widget/WebSiteScreens.xml >> ofbiz/trunk/applications/product/data/ProductTypeData.xml >> >> Modified: ofbiz/trunk/applications/content/data/ContentOperationData.xml >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/ContentOperationData.xml?rev=911774&r1=911773&r2=911774&view=diff >> ============================================================================== >> --- ofbiz/trunk/applications/content/data/ContentOperationData.xml (original) >> +++ ofbiz/trunk/applications/content/data/ContentOperationData.xml Fri Feb >> 19 10:27:10 2010 >> @@ -68,6 +68,7 @@ >> <ContentPurposeType contentPurposeTypeId="USER" description="User"/> >> <ContentPurposeType contentPurposeTypeId="FAQ" description="FAQ"/> >> <ContentPurposeType contentPurposeTypeId="SOURCE" description="General >> Source"/> >> + <ContentPurposeType contentPurposeTypeId="LANDING_PAGE_IMAGE" >> description="Landing Page Image"/> >> >> <ContentPurposeOperation contentPurposeTypeId="ARTICLE" >> contentOperationId="CONTENT_CREATE" roleTypeId="CONTENT_AUTHOR" >> statusId="CTNT_PUBLISHED" privilegeEnumId="CNT_PRV_NA_"/> >> <ContentPurposeOperation contentPurposeTypeId="ARTICLE" >> contentOperationId="CONTENT_CREATE" roleTypeId="CONTENT_AUTHOR" >> statusId="_NA_" privilegeEnumId="CNT_PRV_NA_"/> >> >> Modified: ofbiz/trunk/applications/content/entitydef/entitymodel.xml >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/entitydef/entitymodel.xml?rev=911774&r1=911773&r2=911774&view=diff >> ============================================================================== >> --- ofbiz/trunk/applications/content/entitydef/entitymodel.xml (original) >> +++ ofbiz/trunk/applications/content/entitydef/entitymodel.xml Fri Feb 19 >> 10:27:10 2010 >> @@ -540,6 +540,7 @@ >> title="Content Purpose Entity"> >> <field name="contentId" type="id-ne"></field> >> <field name="contentPurposeTypeId" type="id-ne"></field> >> + <field name="sequenceNum" type="numeric"></field> >> <prim-key field="contentId"/> >> <prim-key field="contentPurposeTypeId"/> >> <relation type="one" fk-name="CONTENT_PRP" rel-entity-name="Content"> >> @@ -1618,4 +1619,15 @@ >> <key-map field-name="webSiteId"/> >> </relation> >> </entity> >> + <view-entity entity-name="ContentAssocAndContentPurpose" >> + package-name="org.ofbiz.content.compdoc" >> + title="ContentAssoc and ContentPurpose View Entity"> >> + <member-entity entity-alias="CNTA" entity-name="ContentAssoc"/> >> + <member-entity entity-alias="CNTP" entity-name="ContentPurpose"/> >> + <alias-all entity-alias="CNTA"/> >> + <alias-all entity-alias="CNTP"/> >> + <view-link entity-alias="CNTA" rel-entity-alias="CNTP"> >> + <key-map field-name="contentIdTo" rel-field-name="contentId"/> >> + </view-link> >> + </view-entity> >> </entitymodel> >> >> Modified: ofbiz/trunk/applications/content/servicedef/services_content.xml >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services_content.xml?rev=911774&r1=911773&r2=911774&view=diff >> ============================================================================== >> --- ofbiz/trunk/applications/content/servicedef/services_content.xml >> (original) >> +++ ofbiz/trunk/applications/content/servicedef/services_content.xml Fri Feb >> 19 10:27:10 2010 >> @@ -46,8 +46,8 @@ >> <attribute name="mapKey" type="String" mode="IN" optional="true"/> >> <attribute name="contentId" type="String" mode="INOUT" >> optional="true"/> >> <attribute name="fromDate" type="Timestamp" mode="IN" >> optional="true"/> >> + <attribute name="sequenceNum" type="Long" mode="IN" >> optional="true"/> >> <override name="contentTypeId" default-value="DOCUMENT"/> >> - >> </service> >> >> <service name="createTextAndUploadedContent" engine="simple" auth="true" >> >> Modified: >> ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSContent.ftl >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSContent.ftl?rev=911774&r1=911773&r2=911774&view=diff >> ============================================================================== >> --- >> ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSContent.ftl >> (original) >> +++ >> ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSContent.ftl >> Fri Feb 19 10:27:10 2010 >> @@ -127,6 +127,9 @@ >> <#if (!contentRoot?has_content)> >> <#assign contentRoot = parameters.contentRoot/> >> </#if> >> + <#if (currentPurposes?has_content)> >> + <#assign currentPurpose = >> Static["org.ofbiz.entity.util.EntityUtil"].getFirst(currentPurposes) /> >> + </#if> >> <#if (content?has_content)> >> <#assign actionPrefix = "/update"/> >> <#else> >> @@ -191,8 +194,8 @@ >> <td class="label">${uiLabelMap.CommonPurpose}</td> >> <td> >> <select name="contentPurposeTypeId"> >> - <#if (currentPurposes?has_content)> >> - <#assign purpose = >> currentPurposes[0].getRelatedOne("ContentPurposeType")/> >> + <#if (currentPurpose?has_content)> >> + <#assign purpose = >> currentPurpose.getRelatedOne("ContentPurposeType")/> >> <option >> value="${purpose.contentPurposeTypeId}">${purpose.description?default(purpose.contentPurposeTypeId)}</option> >> <option >> value="${purpose.contentPurposeTypeId}">----</option> >> <#else> >> @@ -206,6 +209,12 @@ >> </td> >> </tr> >> <tr> >> + <td class="label">${uiLabelMap.CommonSequenceNum}</td> >> + <td> >> + <input type="text" name="sequenceNum" >> value="${(currentPurpose.sequenceNum)?if_exists}" size="5" /> >> + </td> >> + </tr> >> + <tr> >> <td class="label">${uiLabelMap.ContentDataType}</td> >> <td> >> <select name="dataTemplateTypeId"> >> @@ -247,7 +256,7 @@ >> <#if (content?has_content)> >> <#if (content.templateDataResourceId?has_content && >> content.templateDataResourceId != "NONE")> >> <#assign template = >> content.getRelatedOne("TemplateDataResource")/> >> - <option >> value="${template.dataResourceId}">${template.dataResourceName}</option> >> + <option >> value="${template.dataResourceId}">${template.dataResourceName?if_exists}</option> >> <option >> value="${template.dataResourceId}">----</option> >> </#if> >> </#if> >> >> Modified: ofbiz/trunk/applications/content/widget/WebSiteScreens.xml >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/WebSiteScreens.xml?rev=911774&r1=911773&r2=911774&view=diff >> ============================================================================== >> --- ofbiz/trunk/applications/content/widget/WebSiteScreens.xml (original) >> +++ ofbiz/trunk/applications/content/widget/WebSiteScreens.xml Fri Feb 19 >> 10:27:10 2010 >> @@ -221,6 +221,7 @@ >> <entity-one entity-name="ElectronicText" >> value-field="dataText"> >> <field-map field-name="dataResourceId" >> from-field="content.dataResourceId"/> >> </entity-one> >> + <set field="parameters.fromDate" type="Timestamp" >> from-field="parameters.fromDate"/> >> <entity-one entity-name="ContentAssoc" value-field="assoc"> >> <field-map field-name="contentId" >> from-field="parameters.contentIdFrom"/> >> <field-map field-name="contentIdTo" >> from-field="parameters.contentId"/> >> >> Modified: ofbiz/trunk/applications/product/data/ProductTypeData.xml >> URL: >> http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/ProductTypeData.xml?rev=911774&r1=911773&r2=911774&view=diff >> ============================================================================== >> --- ofbiz/trunk/applications/product/data/ProductTypeData.xml (original) >> +++ ofbiz/trunk/applications/product/data/ProductTypeData.xml Fri Feb 19 >> 10:27:10 2010 >> @@ -422,6 +422,7 @@ >> <ProductPriceType description="Competitive Price" >> productPriceTypeId="COMPETITIVE_PRICE"/> >> <ProductPriceType description="Wholesale Price" >> productPriceTypeId="WHOLESALE_PRICE"/> >> <ProductPriceType description="Special Promo Price" >> productPriceTypeId="SPECIAL_PROMO_PRICE"/> >> + <ProductPriceType description="Box Price" >> productPriceTypeId="BOX_PRICE"/> >> >> <ProductPricePurpose description="Purchase/Initial" >> productPricePurposeId="PURCHASE"/> >> <ProductPricePurpose description="Recurring Charge" >> productPricePurposeId="RECURRING_CHARGE"/> >> >> >
smime.p7s
Description: S/MIME cryptographic signature
