svn commit: r742559 - in /ofbiz/trunk: framework/common/webcommon/portal/ specialpurpose/mypage/webapp/mypage/WEB-INF/actions/ specialpurpose/myportal/webapp/myportal/WEB-INF/ specialpurpose/myportal/webapp/myportal/WEB-INF/actions/ specialpurpose/mypo...

[hansbak-2]

Author: hansbak
Date: Mon Feb  9 15:20:17 2009
New Revision: 742559

URL: http://svn.apache.org/viewvc?rev=742559&view=rev
Log:
some more fault fixes in myportal

Modified:
    ofbiz/trunk/framework/common/webcommon/portal/showPortalPage.ftl
    ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/actions/ConvertInvoiceCurrency.groovy
    ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/actions/ConvertInvoiceCurrency.groovy
    ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml
    ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
    ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml

Modified: ofbiz/trunk/framework/common/webcommon/portal/showPortalPage.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/portal/showPortalPage.ftl?rev=742559&r1=742558&r2=742559&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/portal/showPortalPage.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/portal/showPortalPage.ftl Mon Feb  9 15:20:17 2009
@@ -36,6 +36,7 @@
           <#assign firstInColumn = false/>
         </#if>
       </#list>
+      </td>
       <#if portalPageColumn_has_next>
         <td>&nbsp;</td>
       </#if>

Modified: ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/actions/ConvertInvoiceCurrency.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/actions/ConvertInvoiceCurrency.groovy?rev=742559&r1=742558&r2=742559&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/actions/ConvertInvoiceCurrency.groovy (original)
+++ ofbiz/trunk/specialpurpose/mypage/webapp/mypage/WEB-INF/actions/ConvertInvoiceCurrency.groovy Mon Feb  9 15:20:17 2009
@@ -42,7 +42,7 @@
   if (currencyUomId && otherCurrency && otherCurrency != currencyUomId && !otherCurrency.equals(currencyUomId)) {
     result = dispatcher.runSync("convertUom", [uomId : currencyUomId,
                                                uomIdTo : otherCurrency,
-                                               originalValue : BigDecimal.ONE),
+                                               originalValue : BigDecimal.ONE,
                                                asOfDate : invoiceDate]);
     
     if (result.convertedValue != null) {

Modified: ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/actions/ConvertInvoiceCurrency.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/actions/ConvertInvoiceCurrency.groovy?rev=742559&r1=742558&r2=742559&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/actions/ConvertInvoiceCurrency.groovy (original)
+++ ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/actions/ConvertInvoiceCurrency.groovy Mon Feb  9 15:20:17 2009
@@ -42,7 +42,7 @@
   if (currencyUomId && otherCurrency && otherCurrency != currencyUomId && !otherCurrency.equals(currencyUomId)) {
     result = dispatcher.runSync("convertUom", [uomId : currencyUomId,
                                                uomIdTo : otherCurrency,
-                                               originalValue : BigDecimal.ONE),
+                                               originalValue : BigDecimal.ONE,
                                                asOfDate : invoiceDate]);
     
     if (result.convertedValue != null) {

Modified: ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml?rev=742559&r1=742558&r2=742559&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml Mon Feb  9 15:20:17 2009
@@ -35,6 +35,7 @@
     <request-map uri="createRegister">
         <security https="true" auth="false"/>
         <event type="simple" invoke="createRegister" path="org/ofbiz/myportal/Events.xml"/>
+        <response name="error" type="view" value="newRegisterLogin"/>
         <response name="resultPage" type="view" value="newRegisterLogin"/>
     </request-map>
     

Modified: ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml?rev=742559&r1=742558&r2=742559&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml Mon Feb  9 15:20:17 2009
@@ -156,7 +156,7 @@
     <screen name="main">
         <section>
             <actions>
-                <set field="parameters.portalPageId" value="MYPORTAL"/>
+                <set field="parameters.parentPortalPageId" value="MYPORTAL"/>
                 <script location="component://common/webcommon/WEB-INF/actions/includes/ShowPortalPage.groovy"/>
                 <set field="headerItem" from-field="parameters.portalPageId"/>
             </actions>

Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml?rev=742559&r1=742558&r2=742559&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml Mon Feb  9 15:20:17 2009
@@ -1019,7 +1019,7 @@
     <screen name="Party">
         <section>
             <actions>
-                <set field="parameters.partyId" from-field="userLogin.userLoginId"/>
+                <set field="parameters.partyId" from-field="userLogin.partyId"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy"/>
             </actions>
@@ -1048,7 +1048,7 @@
     <screen name="Contact">
         <section>
             <actions>
-                <set field="parameters.partyId" from-field="userLogin.userLoginId"/>
+                <set field="parameters.partyId" from-field="userLogin.partyId"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy"/>
             </actions>
@@ -1077,7 +1077,7 @@
     <screen name="contactsAndAccounts">
         <section>
             <actions>
-                <set field="parameters.partyId" from-field="userLogin.userLoginId"/>
+                <set field="parameters.partyId" from-field="userLogin.partyId"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy"/>
             </actions>
@@ -1106,7 +1106,7 @@
     <screen name="LoyaltyPoints">
         <section>
             <actions>
-                <set field="parameters.partyId" from-field="userLogin.userLoginId"/>
+                <set field="parameters.partyId" from-field="userLogin.partyId"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy"/>
             </actions>
@@ -1135,7 +1135,7 @@
     <screen name="PaymentMethods">
         <section>
             <actions>
-                <set field="parameters.partyId" from-field="userLogin.userLoginId"/>
+                <set field="parameters.partyId" from-field="userLogin.partyId"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy"/>
             </actions>
@@ -1164,7 +1164,7 @@
     <screen name="AvsSettings">
         <section>
             <actions>
-                <set field="parameters.partyId" from-field="userLogin.userLoginId"/>
+                <set field="parameters.partyId" from-field="userLogin.partyId"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy"/>
             </actions>
@@ -1193,7 +1193,7 @@
     <screen name="FinAccounts">
         <section>
             <actions>
-                <set field="parameters.partyId" from-field="userLogin.userLoginId"/>
+                <set field="parameters.partyId" from-field="userLogin.partyId"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy"/>
             </actions>
@@ -1222,7 +1222,7 @@
     <screen name="UserLogin">
         <section>
             <actions>
-                <set field="parameters.partyId" from-field="userLogin.userLoginId"/>
+                <set field="parameters.partyId" from-field="userLogin.partyId"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy"/>
             </actions>
@@ -1251,7 +1251,7 @@
     <screen name="Attributes">
         <section>
             <actions>
-                <set field="parameters.partyId" from-field="userLogin.userLoginId"/>
+                <set field="parameters.partyId" from-field="userLogin.partyId"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy"/>
             </actions>
@@ -1280,7 +1280,7 @@
     <screen name="Visits">
         <section>
             <actions>
-                <set field="parameters.partyId" from-field="userLogin.userLoginId"/>
+                <set field="parameters.partyId" from-field="userLogin.partyId"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy"/>
             </actions>
@@ -1309,7 +1309,7 @@
     <screen name="Cart">
         <section>
             <actions>
-                <set field="parameters.partyId" from-field="userLogin.userLoginId"/>
+                <set field="parameters.partyId" from-field="userLogin.partyId"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy"/>
             </actions>
@@ -1338,7 +1338,7 @@
     <screen name="SerializedInventory">
         <section>
             <actions>
-                <set field="parameters.partyId" from-field="userLogin.userLoginId"/>
+                <set field="parameters.partyId" from-field="userLogin.partyId"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy"/>
             </actions>
@@ -1367,7 +1367,7 @@
     <screen name="Subscriptions">
         <section>
             <actions>
-                <set field="parameters.partyId" from-field="userLogin.userLoginId"/>
+                <set field="parameters.partyId" from-field="userLogin.partyId"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy"/>
             </actions>
@@ -1396,7 +1396,7 @@
     <screen name="Content">
         <section>
             <actions>
-                <set field="parameters.partyId" from-field="userLogin.userLoginId"/>
+                <set field="parameters.partyId" from-field="userLogin.partyId"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy"/>
             </actions>
@@ -1425,7 +1425,7 @@
     <screen name="ShipperAccount">
         <section>
             <actions>
-                <set field="parameters.partyId" from-field="userLogin.userLoginId"/>
+                <set field="parameters.partyId" from-field="userLogin.partyId"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy"/>
             </actions>
@@ -1454,7 +1454,7 @@
     <screen name="Notes">
         <section>
             <actions>
-                <set field="parameters.partyId" from-field="userLogin.userLoginId"/>
+                <set field="parameters.partyId" from-field="userLogin.partyId"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy"/>
             </actions>
@@ -1483,7 +1483,7 @@
     <screen name="mytasksParty">
         <section>
             <actions>
-                <set field="parameters.partyId" from-field="userLogin.userLoginId"/>
+                <set field="parameters.partyId" from-field="userLogin.partyId"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy"/>
             </actions>
@@ -1512,7 +1512,7 @@
     <screen name="ViewInternalOrg">
         <section>
             <actions>
-                <set field="parameters.partyId" from-field="userLogin.userLoginId"/>
+                <set field="parameters.partyId" from-field="userLogin.partyId"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy"/>
                 <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy"/>
             </actions>