svn commit: r1077932 - in /ofbiz/trunk: applications/content/entitydef/entitymodel.xml framework/common/entitydef/entitymodel.xml

[er...@apache.org]

Author: erwan
Date: Fri Mar  4 13:26:46 2011
New Revision: 1077932

URL: http://svn.apache.org/viewvc?rev=1077932&view=rev
Log:
Adding a new field to portalPage helpContentId so we can associate a help screen to a portalPage

Modified:
    ofbiz/trunk/applications/content/entitydef/entitymodel.xml
    ofbiz/trunk/framework/common/entitydef/entitymodel.xml

Modified: ofbiz/trunk/applications/content/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/entitydef/entitymodel.xml?rev=1077932&r1=1077931&r2=1077932&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/content/entitydef/entitymodel.xml Fri Mar  4 13:26:46 2011
@@ -1636,4 +1636,12 @@ under the License.
             <key-map field-name="contentIdTo" rel-field-name="contentId"/>
         </view-link>
     </view-entity>
+
+    <!-- defined as an extend and not directly in common to avoid dependencies between common and content -->
+    <extend-entity entity-name="PortalPage">
+        <field name="helpContentId" type="id"><description>Used to give contentId which will be shown when help on this page will be called</description></field>
+        <relation type="one" fk-name="PORTPAL_HELP_CONT" rel-entity-name="Content">
+            <key-map field-name="helpContentId" rel-field-name="contentId"/>
+        </relation>
+    </extend-entity>
 </entitymodel>

Modified: ofbiz/trunk/framework/common/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/entitydef/entitymodel.xml?rev=1077932&r1=1077931&r2=1077932&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/framework/common/entitydef/entitymodel.xml Fri Mar  4 13:26:46 2011
@@ -681,12 +681,20 @@ under the License.
         <field name="portalPageId" type="id-ne"></field>
         <field name="portalPageName" type="name"></field>
         <field name="description" type="description"></field>
+        <!-- defined in an extend in content component to avoid dependencies between common and content
+        <field name="helpContentId" type="id"><description>Used to give contentId which will be shown when help on this page will be called</description></field>
+         -->
         <field name="ownerUserLoginId" type="id"></field>
         <field name="originalPortalPageId" type="id"><description>The system portal page this page is derived from</description></field>
         <field name="parentPortalPageId" type="id"><description>the parent this page is belonging to, normally the startpage of the portal page group</description></field>
         <field name="sequenceNum" type="numeric"></field>
         <field name="securityGroupId" type="id"></field>
         <prim-key field="portalPageId"/>
+        <!-- defined in an extend in content component to avoid dependencies between common and content
+        <relation type="one" fk-name="PORTPAL_HELP_CONTENT" rel-entity-name="Content">
+          <key-map field-name="helpContentId" rel-field-name="contentId"/>
+        </relation>
+        -->
         <relation type="one" fk-name="PortPage_PARENT" title="Parent" rel-entity-name="PortalPage">
           <key-map field-name="parentPortalPageId" rel-field-name="portalPageId"/>
         </relation>