svn commit: r419440 - in /incubator/ofbiz/trunk/applications/product: script/org/ofbiz/product/subscription/SubscriptionServices.xml servicedef/services_subscription.xml webapp/catalog/product/ProductForms.xml

[jonesde]

Author: jonesde
Date: Wed Jul  5 22:22:07 2006
New Revision: 419440

URL: http://svn.apache.org/viewvc?rev=419440&view=rev
Log:
Fixed some stuff in the Product->Subscription Resource forms; had passed these over in the last round of testing

Modified:
    incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml
    incubator/ofbiz/trunk/applications/product/servicedef/services_subscription.xml
    incubator/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml

Modified: incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml?rev=419440&r1=419439&r2=419440&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml (original)
+++ incubator/ofbiz/trunk/applications/product/script/org/ofbiz/product/subscription/SubscriptionServices.xml Wed Jul  5 22:22:07 2006
@@ -108,6 +108,7 @@
         <check-errors/>
         <make-value entity-name="ProductSubscriptionResource" value-name="newEntity"/>
         <set-pk-fields map-name="parameters" value-name="newEntity"/>
+        <if-empty field-name="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty>
         <set-nonpk-fields map-name="parameters" value-name="newEntity"/>
         <create-value value-name="newEntity"/>
     </simple-method>  

Modified: incubator/ofbiz/trunk/applications/product/servicedef/services_subscription.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/servicedef/services_subscription.xml?rev=419440&r1=419439&r2=419440&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/product/servicedef/services_subscription.xml (original)
+++ incubator/ofbiz/trunk/applications/product/servicedef/services_subscription.xml Wed Jul  5 22:22:07 2006
@@ -70,6 +70,7 @@
         <description>Create a ProductSubscriptionResource Record</description>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
+        <override name="fromDate" optional="true"/>
     </service>
     <service name="updateProductSubscriptionResource" default-entity-name="ProductSubscriptionResource" auth="true" engine="simple"
         location="org/ofbiz/product/subscription/SubscriptionServices.xml" invoke="updateProductSubscriptionResource">

Modified: incubator/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml?rev=419440&r1=419439&r2=419440&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml (original)
+++ incubator/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml Wed Jul  5 22:22:07 2006
@@ -1089,16 +1089,16 @@
         <auto-fields-service service-name="updateProductSubscriptionResource"/>
         
         <field name="productId"><hidden/></field>
-        <field name="subscriptionResourceId" title="${uiLabelMap.ExampleFeature}" widget-style="tabletext">
+        <field name="subscriptionResourceId" widget-style="tabletext">
             <display-entity entity-name="SubscriptionResource" description="${description}">
                 <sub-hyperlink target="EditSubscriptionResource?subscriptionResourceId=${subscriptionResourceId}" description="${exampleFeatureId}" link-style="buttontext"/>
             </display-entity>
         </field>
-        <field name="fromDate"><display/></field>
+        <field name="fromDate" widget-style="tabletext"><display/></field>
         
         <field name="useTimeUomId" widget-style="selectBox">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Uom" description="${description} (${abbreviation})">
+                <entity-options entity-name="Uom" description="${description} (${abbreviation})" key-field-name="uomId">
                     <entity-constraint name="uomTypeId" value="TIME_FREQ_MEASURE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -1106,7 +1106,7 @@
         </field>
         <field name="useRoleTypeId" widget-style="selectBox">
             <drop-down allow-empty="true">
-                <entity-options entity-name="RoleType" description="${description}">
+                <entity-options entity-name="RoleType" description="${description}" key-field-name="roleTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -1119,15 +1119,22 @@
         </field>
     </form>
     <form name="AddProductSubscriptionResource" type="single"
-        target="example_createProductSubscriptionResource"
+        target="createProductSubscriptionResource"
         default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
         <auto-fields-service service-name="createProductSubscriptionResource"/>
         
-        <field name="exampleId"><hidden/></field>
-        <field name="exampleFeatureId" title="${uiLabelMap.ExampleFeature}"><lookup target-form-name="LookupExampleFeature"/></field>
+        <field name="productId"><hidden/></field>
+        <field name="subscriptionResourceId" widget-style="selectBox">
+            <drop-down allow-empty="false">
+                <entity-options entity-name="SubscriptionResource" description="${description}">
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
+        
         <field name="useTimeUomId" widget-style="selectBox">
             <drop-down allow-empty="true">
-                <entity-options entity-name="Uom" description="${description} (${abbreviation})">
+                <entity-options entity-name="Uom" description="${description} (${abbreviation})" key-field-name="uomId">
                     <entity-constraint name="uomTypeId" value="TIME_FREQ_MEASURE"/>
                     <entity-order-by field-name="description"/>
                 </entity-options>
@@ -1135,7 +1142,7 @@
         </field>
         <field name="useRoleTypeId" widget-style="selectBox">
             <drop-down allow-empty="true">
-                <entity-options entity-name="RoleType" description="${description}">
+                <entity-options entity-name="RoleType" description="${description}" key-field-name="roleTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>