svn commit: r750805 - in /ofbiz/trunk: applications/party/ applications/party/data/ applications/party/webapp/partymgr/WEB-INF/ applications/party/widget/partymgr/ framework/common/webcommon/WEB-INF/ specialpurpose/myportal/data/ specialpurpose/myporta...

[hansbak-2]

Author: hansbak
Date: Fri Mar  6 08:17:34 2009
New Revision: 750805

URL: http://svn.apache.org/viewvc?rev=750805&view=rev
Log:
move of the first portlet from myportal to the original party component

Added:
    ofbiz/trunk/applications/party/data/PartyPortletData.xml   (with props)
Modified:
    ofbiz/trunk/applications/party/ofbiz-component.xml
    ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
    ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml
    ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml
    ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
    ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml

Added: ofbiz/trunk/applications/party/data/PartyPortletData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/data/PartyPortletData.xml?rev=750805&view=auto
==============================================================================
--- ofbiz/trunk/applications/party/data/PartyPortletData.xml (added)
+++ ofbiz/trunk/applications/party/data/PartyPortletData.xml Fri Mar  6 08:17:34 2009
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<entity-engine-xml>
+    
+    <PortalPortlet portalPortletId="party" portletName="Party Info" screenName="Party" screenLocation="component://party/widget/partymgr/ProfileScreens.xml" description="General information about a person or party group" />
+
+</entity-engine-xml>

Propchange: ofbiz/trunk/applications/party/data/PartyPortletData.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/applications/party/data/PartyPortletData.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/applications/party/data/PartyPortletData.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ofbiz/trunk/applications/party/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/ofbiz-component.xml?rev=750805&r1=750804&r2=750805&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/party/ofbiz-component.xml Fri Mar  6 08:17:34 2009
@@ -30,6 +30,7 @@
     <entity-resource type="data" reader-name="seed" loader="main" location="data/PartyTypeData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/PartySecurityData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/PartyGeoPointData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/PartyPortletData.xml"/>
     <entity-resource type="data" reader-name="seed-initial" loader="main" location="data/ScheduledJobs.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>
     <service-resource type="model" loader="main" location="servicedef/services_view.xml"/>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=750805&r1=750804&r2=750805&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Fri Mar  6 08:17:34 2009
@@ -46,7 +46,7 @@
 
     <request-map uri="main"><security https="true" auth="true"/><response name="success" type="view" value="main"/></request-map>
 
-    <request-map uri="viewprofile"><security https="true" auth="true"/><response name="success" type="view" value="viewprofile"/></request-map>
+    <request-map uri="viewprofile"><security https="true" auth="true"/><response name="success" type="view" value="viewprofile" save-last-view="true"/></request-map>
     <request-map uri="EditPartyRelationships"><security https="true" auth="true"/><response name="success" type="view" value="EditPartyRelationships"/></request-map>
     <request-map uri="viewroles"><security https="true" auth="true"/><response name="success" type="view" value="viewroles"/></request-map>
     <request-map uri="linkparty"><security https="true" auth="true"/><response name="success" type="view" value="linkparty"/></request-map>
@@ -357,7 +357,7 @@
     <request-map uri="updatePerson">
         <security https="true" auth="true"/>
         <event type="service" path="" invoke="updatePerson"/>
-        <response name="success" type="request" value="viewprofile"/>
+        <response name="success" type="view-last"/>
         <response name="error" type="view" value="EditPerson"/>
     </request-map>
 

Modified: ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml?rev=750805&r1=750804&r2=750805&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml Fri Mar  6 08:17:34 2009
@@ -23,6 +23,9 @@
     <screen name="Party">
         <section>
             <actions>
+                <set field="parameters.partyId" from-field="parameters.partyId" default-value="${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"/>
                 <entity-and entity-name="PartyNameHistory" list="partyNameHistoryList">
                     <field-map field-name="partyId" from-field="parameters.partyId"/>
                     <order-by field-name="-changeDate"/>

Modified: ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml?rev=750805&r1=750804&r2=750805&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml (original)
+++ ofbiz/trunk/framework/common/webcommon/WEB-INF/portal-controller.xml Fri Mar  6 08:17:34 2009
@@ -26,7 +26,7 @@
     <!-- Portal requests -->
     <request-map uri="showPortalPage">
         <security https="true" auth="true"/>
-        <response name="success" type="view" value="showPortalPage"/>
+        <response name="success" type="view" value="showPortalPage" save-last-view="true"/>
     </request-map>
     <request-map uri="ManagePortalPages">
         <security https="true" auth="true"/>

Modified: ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml?rev=750805&r1=750804&r2=750805&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/data/MyPortalTypeData.xml Fri Mar  6 08:17:34 2009
@@ -91,7 +91,6 @@
     <PortalPortlet portalPortletId="UserLogin" portletName="User Login" screenName="UserLogin" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="User Login in myportal from party" />
     <PortalPortlet portalPortletId="Visits" portletName="Visits" screenName="Visits" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="Visits in myportal from party" />
     <PortalPortlet portalPortletId="contact" portletName="Contact" screenName="Contact" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="contact in myportal from party" />
-    <PortalPortlet portalPortletId="party" portletName="Party" screenName="Party" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="profile in myportal from party" />
     <PortalPortlet portalPortletId="mycommunications" portletName="My Communications" screenName="MyCommunications" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="My Communications From My Page" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW" />
     <PortalPortlet portalPortletId="mycompanycomms" portletName="My Company Comms" screenName="MyCompanyComms" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="My Company Comms From My Page" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW" />
     <PortalPortlet portalPortletId="otherCommunications" portletName="Other Communications" screenName="OtherCommunications" screenLocation="component://myportal/widget/MyPortalScreens.xml" description="Other Communications From My Page" securityServiceName="portalPermissionIsEmployee" securityMainAction="VIEW" />

Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml?rev=750805&r1=750804&r2=750805&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml Fri Mar  6 08:17:34 2009
@@ -1016,35 +1016,6 @@
     </screen>
 
     <!-- My Profile Screens -->    
-    <screen name="Party">
-        <section>
-            <actions>
-                <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>
-            <widgets>
-                <section>
-                    <condition>
-                        <not><if-empty field="party"/></not>
-                    </condition>
-                    <widgets>
-                        <section>
-                            <widgets>
-                                <include-screen name="Party" location="component://party/widget/partymgr/ProfileScreens.xml"/>
-                            </widgets>
-                        </section>
-                    </widgets>
-                    <fail-widgets>
-                        <container>
-                            <label style="h3">${uiLabelMap.PartyNoPartyFoundWithPartyId}: ${parameters.partyId}</label>
-                        </container>
-                    </fail-widgets>
-                </section>
-            </widgets>
-        </section>
-    </screen>
-
     <screen name="Contact">
         <section>
             <actions>