Author: adrianc
Date: Tue Jul 15 10:05:45 2008
New Revision: 676977
URL:
http://svn.apache.org/viewvc?rev=676977&view=revLog:
Converted Party Manager->View Profile->Subscriptions screenlet to form widget.
Removed:
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Subscriptions.ftl
Modified:
ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml
ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml?rev=676977&r1=676976&r2=676977&view=diff==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml Tue Jul 15 10:05:45 2008
@@ -638,5 +638,26 @@
<hyperlink target="viewprofile?partyId=${partyIdFrom}" description="${partyIdFrom}"/>
</field>
<field name="fromDate"><display/></field>
- </form>
+ </form>
+
+ <form name="ListSubscriptions" type="list" list-name="subscriptionList" default-table-style="basic-table">
+ <field name="subscriptionId"><display/></field>
+ <field name="subscriptionTypeId" title="${uiLabelMap.ProductSubscription} ${uiLabelMap.CommonType}">
+ <display-entity entity-name="SubscriptionType" description="${description}"/>
+ </field>
+<!-- <field name="subscriptionResourceId">
+ <display-entity entity-name="SubscriptionResource" description="${description}">
+ <sub-hyperlink target="EditSubscriptionResource?subscriptionResourceId=${subscriptionResourceId}" description="${subscriptionResourceId}" link-style="buttontext"/>
+ </display-entity>
+ </field> -->
+ <field name="description"><display/></field>
+ <field name="productId">
+ <display-entity entity-name="Product" description="${productName}">
+ <sub-hyperlink target="/catalog/control/EditProduct?productId=${productId}" target-type="inter-app" description="${productId}" link-style="buttontext"/>
+ </display-entity>
+ </field>
+ <field name="fromDate"><display/></field>
+ <field name="thruDate"><display/></field>
+ </form>
+
</forms>
Modified: ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml?rev=676977&r1=676976&r2=676977&view=diff==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml Tue Jul 15 10:05:45 2008
@@ -352,7 +352,6 @@
<actions>
<property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
-
<entity-condition entity-name="Subscription" list-name="subscriptionList" filter-by-date="true">
<condition-list>
<condition-expr field-name="partyId" operator="equals" env-name="parameters.partyId"/>
@@ -368,11 +367,9 @@
</not>
</condition>
<widgets>
- <platform-specific>
- <html>
- <html-template location="component://party/webapp/partymgr/party/profileblocks/Subscriptions.ftl"/>
- </html>
- </platform-specific>
+ <screenlet id="subscription-summary" title="${uiLabelMap.ProductSubscriptions}" collapsible="true">
+ <include-form name="ListSubscriptions" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
+ </screenlet>
</widgets>
</section>
</widgets>
Locked
