Author: jaz
Date: Thu Feb 22 14:08:44 2007 New Revision: 510683 URL: http://svn.apache.org/viewvc?view=rev&rev=510683 Log: fixed path alias to reference content directly, instead of having to go through a path format Modified: ofbiz/trunk/applications/content/data/DataCategoryData.xml ofbiz/trunk/applications/content/entitydef/entitymodel.xml ofbiz/trunk/applications/content/servicedef/services_website.xml Modified: ofbiz/trunk/applications/content/data/DataCategoryData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/DataCategoryData.xml?view=diff&rev=510683&r1=510682&r2=510683 ============================================================================== --- ofbiz/trunk/applications/content/data/DataCategoryData.xml (original) +++ ofbiz/trunk/applications/content/data/DataCategoryData.xml Thu Feb 22 14:08:44 2007 @@ -34,4 +34,5 @@ <DataCategory dataCategoryId="TECH_SOFT_JAVA" parentCategoryId="TECH_SOFT" categoryName="Java"/> <DataCategory dataCategoryId="TECH_HARD" parentCategoryId="TECHNOLOGY" categoryName="Hardware"/> <DataCategory dataCategoryId="TECH_SERV" parentCategoryId="TECHNOLOGY" categoryName="Service"/> + <DataCategory dataCategoryId="TEMPLATE" parentCategoryId="ROOT" categoryName="Template"/> </entity-engine-xml> Modified: ofbiz/trunk/applications/content/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/entitydef/entitymodel.xml?view=diff&rev=510683&r1=510682&r2=510683 ============================================================================== --- ofbiz/trunk/applications/content/entitydef/entitymodel.xml (original) +++ ofbiz/trunk/applications/content/entitydef/entitymodel.xml Thu Feb 22 14:08:44 2007 @@ -1551,10 +1551,15 @@ <field name="webSiteId" type="id-ne"></field> <field name="pathAlias" type="id-vlong"></field> <field name="aliasTo" type="long-varchar"></field> + <field name="contentId" type="id"></field> + <field name="mapKey" type="name"></field> <prim-key field="webSiteId"/> <prim-key field="pathAlias"/> <relation type="one" fk-name="WSPATH_WEBSITE" rel-entity-name="WebSite"> <key-map field-name="webSiteId"/> + </relation> + <relation type="one" fk-name="WSPATH_CONTENT" rel-entity-name="Content"> + <key-map field-name="contentId"/> </relation> </entity> <entity entity-name="WebSitePublishPoint" Modified: ofbiz/trunk/applications/content/servicedef/services_website.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services_website.xml?view=diff&rev=510683&r1=510682&r2=510683 ============================================================================== --- ofbiz/trunk/applications/content/servicedef/services_website.xml (original) +++ ofbiz/trunk/applications/content/servicedef/services_website.xml Thu Feb 22 14:08:44 2007 @@ -95,13 +95,15 @@ location="org/ofbiz/content/website/WebSiteServices.xml" invoke="createWebSitePathAlias"> <description>Create a WebSite Path Alias</description> <permission-service service-name="contentManagerPermission" main-action="CREATE"/> - <auto-attributes include="all" mode="IN" optional="false"/> + <auto-attributes include="pk" mode="IN" optional="false"/> + <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="udpateWebSitePathAlias" default-entity-name="WebSitePathAlias" engine="simple" auth="true" location="org/ofbiz/content/website/WebSiteServices.xml" invoke="updateWebSitePathAlias"> <description>Update a WebSite Path Alias</description> <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> - <auto-attributes include="all" mode="IN" optional="false"/> + <auto-attributes include="pk" mode="IN" optional="false"/> + <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="removeWebSitePathAlias" default-entity-name="WebSitePathAlias" engine="simple" auth="true" location="org/ofbiz/content/website/WebSiteServices.xml" invoke="removeWebSitePathAlias"> |
Free forum by Nabble | Edit this page |