You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2009/10/09 12:24:25 UTC
svn commit: r823501 - in /ofbiz/trunk/specialpurpose/myportal:
webapp/myportal/WEB-INF/actions/ widget/CommonScreens.xml
widget/MyPortalForms.xml widget/MyPortalMenus.xml widget/RequestForms.xml
Author: hansbak
Date: Fri Oct 9 10:24:24 2009
New Revision: 823501
URL: http://svn.apache.org/viewvc?rev=823501&view=rev
Log:
and some final files not used
Removed:
ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/actions/
ofbiz/trunk/specialpurpose/myportal/widget/RequestForms.xml
Modified:
ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml
Modified: ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml?rev=823501&r1=823500&r2=823501&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml Fri Oct 9 10:24:24 2009
@@ -173,7 +173,7 @@
<widgets>
<label style="h2" text="${uiLabelMap.MyPortalRegisterComplete}"/><link target="main" style="h2" text="${uiLabelMap.CommonBeLogged}"/>
<screenlet title="${uiLabelMap.PartyPersonalInformation}">
- <include-form name="ViewPartyPerson" location="component://myportal/widget/MyPortalForms.xml"/>
+ <include-form name="ViewPartyPerson" location="component://party/webapp/partymgr/party/PartyForms.xml"/>
</screenlet>
</widgets>
<fail-widgets>
Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml?rev=823501&r1=823500&r2=823501&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml Fri Oct 9 10:24:24 2009
@@ -21,21 +21,6 @@
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
- <form name="ViewRequestWorkEfforts" extends="ViewRequestWorkEfforts" extends-resource="component://order/widget/ordermgr/CustRequestForms.xml">
- <field name="workEffortId">
- <hyperlink target="/projectmgr/control/taskView" description="${workEffortName} [${workEffortId}]" target-type="inter-app">
- <parameter param-name="workEffortId"/>
- </hyperlink>
- </field>
- </form>
-
- <form name="EditCustRequest" extends="EditCustRequest" extends-resource="component://projectmgr/widget/forms/CustRequestForms.xml">
- <field name="fromPartyId" title="${uiLabelMap.OrderRequestingParty}"><hidden value="${userLogin.partyId}"/></field>
- <field name="custRequestDate"><ignored/></field>
- <field name="childWorkEffortId"><ignored/></field>
- <field name="partyId"><ignored/></field>
- </form>
-
<!--New Register Person-->
<form name="RegisterPerson" type="single" target="createRegister" default-map-name="personInfo"
focus-field-name="whyWouldYouLikeToRegister" header-row-style="header-row" default-table-style="basic-table">
@@ -58,16 +43,4 @@
<field name="captchaCode"><hidden value="${parameters.ID_KEY}"/></field>
</form>
- <form name="ViewPartyPerson" type="single" default-map-name="lookupPerson" extends="ViewPartyPerson" extends-resource="component://party/webapp/partymgr/party/PartyForms.xml">
- <actions>
- <entity-one entity-name="PartyAndPerson" value-field="lookupPerson">
- <field-map field-name="partyId" from-field="parameters.partyId"/>
- </entity-one>
- <entity-one entity-name="ContactMech" value-field="contactMech">
- <field-map field-name="contactMechId" from-field="parameters.contactMechId"/>
- </entity-one>
- </actions>
- <field name="infoString" title="${uiLabelMap.CommonEmail}" field-name="contactMech.infoString"><display description="${contactMech.infoString}"/></field>
- </form>
-
</forms>
Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml?rev=823501&r1=823500&r2=823501&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml Fri Oct 9 10:24:24 2009
@@ -30,74 +30,4 @@
</menu-item>
</menu>
- <menu name="MyTasksMenu" type="simple" menu-container-style="button-bar button-style-2" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem">
- <menu-item name="myTasks" title="${uiLabelMap.MyPortalMyTasks}"><link target="/projectmgr/control/MyTasks" url-mode="inter-app"/></menu-item>
- </menu>
-
- <menu name="MyTimesheetMenu">
- <menu-item name="setToComplete" title="${uiLabelMap.MyPortalToComplete}">
- <condition>
- <and>
- <if-compare field="timesheet.statusId" operator="equals" value="TIMESHEET_IN_PROCESS"/>
- <if-compare field="headerItem" operator="equals" value="main"/>
- </and>
- </condition>
- <link target="statusToComplete">
- <parameter param-name="timesheetId" from-field="timesheet.timesheetId"/>
- <parameter param-name="statusId" value="TIMESHEET_COMPLETED"/>
- </link>
- </menu-item>
- <menu-item name="setToCompleteKey" title="${uiLabelMap.MyPortalToComplete}">
- <condition>
- <and>
- <if-compare field="timesheet.statusId" operator="equals" value="TIMESHEET_IN_PROCESS"/>
- <if-compare field="headerItem" operator="not-equals" value="main"/>
- </and>
- </condition>
- <link target="statusToCompleteKey">
- <parameter param-name="timesheetId" from-field="timesheet.timesheetId"/>
- <parameter param-name="statusId" value="TIMESHEET_COMPLETED"/>
- </link>
- </menu-item>
- <menu-item name="myTime" title="${uiLabelMap.MyPortalMyTime}"><link target="/projectmgr/control/MyTimesheet" url-mode="inter-app"/></menu-item>
- </menu>
- <menu name="RequestTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
- <menu-item name="ViewRequest" title="${uiLabelMap.OrderRequestOverview}" >
- <link target="ViewRequest">
- <parameter param-name="custRequestId" from-field="custRequest.custRequestId"/>
- </link>
- </menu-item>
- <menu-item name="custRequestContent" title="${uiLabelMap.ContentContent}">
- <link target="EditCustRequestContent">
- <parameter param-name="custRequestId" from-field="custRequest.custRequestId"/>
- </link>
- </menu-item>
- </menu>
- <menu name="RequestSubTabBar" type="simple" menu-container-style="button-bar button-style-2">
- <menu-item name="cancelledRequest" title="${uiLabelMap.CommonCancel} ${uiLabelMap.OrderRequest}" >
- <condition>
- <and>
- <not><if-empty field="custRequest"/></not>
- <if-compare field="custRequest.statusId" operator="not-equals" value="CRQ_CANCELLED"/>
- <if-compare field="custRequest.statusId" operator="not-equals" value="CRQ_COMPLETED"/>
- </and>
- </condition>
- <link target="setCustRequestStatus">
- <parameter param-name="custRequestId"/>
- <parameter param-name="statusId" value="CRQ_CANCELLED"/>
- </link>
- </menu-item>
- <menu-item name="addContent" title="${uiLabelMap.PageTitleAddContent}">
- <condition>
- <and>
- <not><if-empty field="custRequest"/></not>
- <if-compare field="custRequest.statusId" operator="not-equals" value="CRQ_CANCELLED"/>
- <if-compare field="custRequest.statusId" operator="not-equals" value="CRQ_COMPLETED"/>
- </and>
- </condition>
- <link target="EditCustRequestContent">
- <parameter param-name="custRequestId" from-field="custRequest.custRequestId"/>
- </link>
- </menu-item>
- </menu>
</menus>
\ No newline at end of file