svn commit: r524755 - in /ofbiz/trunk/applications/content: script/org/ofbiz/content/website/WebSiteServices.xml servicedef/services_website.xml webapp/content/website/WebSiteForms.xml

[jacopoc]

Author: jacopoc
Date: Mon Apr  2 02:34:10 2007
New Revision: 524755

URL: http://svn.apache.org/viewvc?view=rev&rev=524755
Log:
Fixed double service definition for the createWebSite service that was causing an error in the Edit Web Site screen

Modified:
    ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml
    ofbiz/trunk/applications/content/servicedef/services_website.xml
    ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml

Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml?view=diff&rev=524755&r1=524754&r2=524755
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml Mon Apr  2 02:34:10 2007
@@ -30,11 +30,9 @@
         <create-value value-name="newEntity"/>
     </simple-method>
     <simple-method method-name="updateWebSite" short-description="Update a WebSite">
-        <make-value value-name="lookupKeyValue" entity-name="WebSite"/>
-        <set-pk-fields map-name="parameters" value-name="lookupKeyValue"/>
-        <find-by-primary-key entity-name="WebSite" map-name="lookupKeyValue" value-name="lookedUpValue"/>
-        <set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
-        <store-value value-name="lookedUpValue"/>
+        <entity-one entity-name="WebSite" value-name="webSite"/>
+        <set-nonpk-fields map-name="parameters" value-name="webSite"/>
+        <store-value value-name="webSite"/>
     </simple-method>
     <simple-method method-name="removeWebSite" short-description="Remove a WebSite">
         <make-value value-name="lookupKeyValue" entity-name="WebSite"/>

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=524755&r1=524754&r2=524755
==============================================================================
--- ofbiz/trunk/applications/content/servicedef/services_website.xml (original)
+++ ofbiz/trunk/applications/content/servicedef/services_website.xml Mon Apr  2 02:34:10 2007
@@ -38,12 +38,6 @@
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
     </service>
-    <service name="updateWebSite" default-entity-name="WebSite" engine="simple" auth="true"
-            location="org/ofbiz/content/website/WebSiteServices.xml" invoke="updateWebSite">
-        <description>Remove a WebSite</description>
-        <permission-service service-name="contentManagerPermission" main-action="DELETE"/>
-        <auto-attributes include="pk" mode="IN" optional="false"/>
-    </service>
 
     <!-- WebSite Content Services -->
     <service name="createWebSiteContent" default-entity-name="WebSiteContent" engine="simple" auth="true"

Modified: ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml?view=diff&rev=524755&r1=524754&r2=524755
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml Mon Apr  2 02:34:10 2007
@@ -23,7 +23,6 @@
 
     <!-- WebSite Forms -->
     <form name="EditWebSite" type="single" target="updateWebSite" title="" default-map-name="webSite">
-        
         <alt-target use-when="webSite==null" target="createWebSite"/>
         
         <auto-fields-service service-name="updateWebSite" map-name=""/>
@@ -46,8 +45,7 @@
                 <sub-hyperlink use-when="&quot;${webSite.productStoreId}&quot;.length()>0" link-style="buttontext" target-type="inter-app" target="/catalog/control/EditProductStore?productStoreId=${webSite.productStoreId}" description="${uiLabelMap.ContentEditProductStore}"/>
             </drop-down>
         </field>
-
-        <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButtonq" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="ListWebSites" target="" title="" type="list" list-name="webSites" paginate-target="FindWebSite" paginate="true">
         <field name="webSiteId" title="${uiLabelMap.CommonId}" widget-style="buttontext">