svn commit: r472800 - in /incubator/ofbiz/trunk/applications/product: entitydef/entitymodel.xml widget/catalog/SubscriptionForms.xml

[hansbak-2]

Author: hansbak
Date: Wed Nov  8 23:15:19 2006
New Revision: 472800

URL: http://svn.apache.org/viewvc?view=rev&rev=472800
Log:
corrections on commit 472774 to leave communicationId in the subscription entitydef and correct a path thanks to David and Jacopo

Modified:
    incubator/ofbiz/trunk/applications/product/entitydef/entitymodel.xml
    incubator/ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml

Modified: incubator/ofbiz/trunk/applications/product/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/entitydef/entitymodel.xml?view=diff&rev=472800&r1=472799&r2=472800
==============================================================================
--- incubator/ofbiz/trunk/applications/product/entitydef/entitymodel.xml (original)
+++ incubator/ofbiz/trunk/applications/product/entitydef/entitymodel.xml Wed Nov  8 23:15:19 2006
@@ -3616,7 +3616,7 @@
     <entity entity-name="Subscription" package-name="org.ofbiz.product.subscription" title="Subscription Entity">
         <field name="subscriptionId" type="id-ne"></field>
         <field name="subscriptionResourceId" type="id"></field>
-        <!--field name="communicationEventId" type="id"></field--><!-- now replaced by entity: SubscriptionCommEvent -->
+        <field name="communicationEventId" type="id"></field><!-- now replaced by entity: SubscriptionCommEvent -->
         <field name="contactMechId" type="id"></field>
         <field name="originatedFromPartyId" type="id"></field>
         <field name="originatedFromRoleTypeId" type="id"></field>

Modified: incubator/ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml?view=diff&rev=472800&r1=472799&r2=472800
==============================================================================
--- incubator/ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml (original)
+++ incubator/ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml Wed Nov  8 23:15:19 2006
@@ -335,7 +335,7 @@
         </actions>    
         <field name="subscriptionId"><hidden/></field>
         <field name="communicationEventId" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${communicationEventId}" target="../../partymgr/control/EditCommunicationEvent?communicationEventId=${communicationEventId}"/>
+            <hyperlink also-hidden="false" description="${communicationEventId}" target="/partymgr/control/EditCommunicationEvent?communicationEventId=${communicationEventId}" target-type="inter-app"/>
         </field>
  <field name="partyIdFrom" title="${uiLabelMap.CommonParty} ${uiLabelMap.CommonFrom}">
             <display-entity description="${firstName} ${lastName} [${partyId}]" entity-name="Person" key-field-name="partyId"/>