svn commit: r759466 - in /ofbiz/trunk: applications/content/webapp/content/cms/ applications/content/webapp/content/contentsetup/ applications/content/webapp/content/layout/ applications/content/widget/compdoc/ applications/content/widget/forum/ framew...

Author: jleroux
Date: Sat Mar 28 14:20:15 2009
New Revision: 759466

URL: http://svn.apache.org/viewvc?rev=759466&view=rev
Log:
4d set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements

Modified:
    ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml
    ofbiz/trunk/applications/content/webapp/content/contentsetup/ContentSetupForms.xml
    ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml
    ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml
    ofbiz/trunk/applications/content/widget/forum/ForumForms.xml
    ofbiz/trunk/framework/common/widget/PortalPageForms.xml
    ofbiz/trunk/specialpurpose/oagis/widget/forms/MessageInfoForms.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml

Modified: ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml?rev=759466&r1=759465&r2=759466&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml Sat Mar 28 14:20:15 2009
@@ -18,7 +18,7 @@
 under the License.
 -->
 
-<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
     <form name="findContent" default-entity-name="ContentAssocDataResourceViewFrom" target="CMSContentFind" title="" type="single"
         header-row-style="header-row" default-table-style="basic-table">
@@ -40,9 +40,15 @@
                 <field-map field-name="entityName" from-field="entityName"/>
             </service>
         </actions>
-    
+
         <field name="editContent" title="${uiLabelMap.CommonEmptyHeader}">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditAddContent?MASTER_contentId=${contentId}&amp;MASTER_drDataResourceId=${drDataResourceId}&amp;MASTER_caContentIdTo=${caContentIdTo}&amp;MASTER_caContentAssocTypeId=${caContentAssocTypeId}&amp;MASTER_caFromDate=${caFromDate}"/>
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditAddContent">
+ <parameter param-name="MASTER_contentId" from-field="contentId"/>
+ <parameter param-name="MASTER_drDataResourceId" from-field="drDataResourceId"/>
+ <parameter param-name="MASTER_caContentIdTo" from-field="caContentIdTo"/>
+ <parameter param-name="MASTER_caContentAssocTypeId" from-field="caContentAssocTypeId"/>
+ <parameter param-name="MASTER_caFromDate" from-field="caFromDate"/>
+ </hyperlink>
 <!--
             <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditContent">
                 <parameter param-name="caContentIdTo"/>
@@ -52,7 +58,7 @@
                 <parameter param-name="caContentId"/>
                 <parameter param-name="contentIdStart"/>
                 <parameter param-name="caContentAssocTypeId"/>
-            </hyperlink>
+            </hyperlink>
 -->
         </field>
         <field name="caContentIdTo"><display/></field>
@@ -174,7 +180,13 @@
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <auto-fields-service service-name="updateContentPurposeOperation" default-field-type="display"/>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentPurposeOperation?contentPurposeTypeId=${contentPurposeTypeId}&amp;contentOperationId=${contentOperationId}&amp;roleTypeId=${roleTypeId}&amp;statusId=${statusId}&amp;privilegeEnumId=${privilegeEnumId}"/>
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentPurposeOperation">
+ <parameter param-name="contentPurposeTypeId" from-field="contentPurposeTypeId"/>
+ <parameter param-name="contentOperationId" from-field="contentOperationId"/>
+ <parameter param-name="roleTypeId" from-field="roleTypeId"/>
+ <parameter param-name="statusId" from-field="statusId"/>
+ <parameter param-name="privilegeEnumId" from-field="privilegeEnumId"/>
+ </hyperlink>
         </field>
     </form>
     <form name="AddContentPurposeOperation" target="addContentPurposeOperation" title="" type="single"
@@ -280,7 +292,7 @@
         </field>
 <!--
         <field name="submitContentEdit" title="${uiLabelMap.CommonEmptyHeader}">
-            <hyperlink also-hidden="false" description="Submit" target="javascript:document.EditAddContent.action='${persistAction}'; document.EditAddContent.submit()" target-type="plain"/>
+            <hyperlink also-hidden="false" description="Submit" target="javascript:document.EditAddContent.action='${persistAction}'; document.EditAddContent.submit()" target-type="plain"/>
         </field>
 -->
        <field name="deactivateExisting" >
@@ -370,7 +382,7 @@
     </form>
     <form name="EditAddBioImage" target="persistBioImage" title="" type="upload" extends="EditAddImageMaster" header-row-style="header-row" default-table-style="basic-table">
     </form>
-  
+
     <form name="AdminIndex" target="AdminIndex" title="" type="single" header-row-style="header-row" default-table-style="basic-table">
         <field name="indexContentIds" position="1"><text size="50"/></field>
         <field name="submitButton" title="${uiLabelMap.ContentIndexEnteredIds}" widget-style="smallSubmit" position="2"><submit button-type="button"/></field>
@@ -388,7 +400,7 @@
     <form name="searchList" type="list" target="" list-name="queryResults" paginate-target="/AdminSearch"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="editContent" title="${uiLabelMap.CommonEmptyHeader}">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="CMSContentEdit?contentId=${contentId}&amp;drDataResourceId=${drDataResourceId}&amp;contentIdTo=${contentIdTo}"/>
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="CMSContentEdit?contentId=${contentId}&amp;drDataResourceId=${drDataResourceId}&amp;contentIdTo=${contentIdTo}"/>
         </field>
         <field name="contentId"><display/></field>
         <field name="dataResourceId"><display/></field>
@@ -400,15 +412,15 @@
         <field name="contentAssocTitle" title="${uiLabelMap.ContentAssoc}" title-style="h1" map-name="dummy">
             <display description=""/>
         </field>
-        <field name="caContentIdTo" position="1"
+        <field name="caContentIdTo" position="1"
             use-when="&quot;${caContentIdTo}&quot;.length()>0" >
             <display />
         </field>
-        <field name="caContentIdTo" position="1"
+        <field name="caContentIdTo" position="1"
             use-when="&quot;${caContentIdTo}&quot;.length()==0" >
             <text />
         </field>
-        <field name="caMapKey" position="2"
+        <field name="caMapKey" position="2"
             use-when="&quot;${caMapKey}&quot;.length()==0" >
             <text />
         </field>
@@ -416,11 +428,11 @@
             use-when="&quot;${caMapKey}&quot;.length()>0" >
             <display />
         </field>
-        <field name="caContentAssocTypeId" position="1"
+        <field name="caContentAssocTypeId" position="1"
             use-when="&quot;${caContentAssocTypeId}&quot;.length()>0" >
             <display />
         </field>
-        <field name="caContentAssocTypeId" position="1"
+        <field name="caContentAssocTypeId" position="1"
             use-when="&quot;${caContentAssocTypeId}&quot;.length()==0" >
             <drop-down allow-empty="true">
                 <entity-options description="${description}" entity-name="ContentAssocType" key-field-name="contentAssocTypeId"/>
@@ -436,12 +448,12 @@
         <field name="contentTitle" title="${uiLabelMap.ContentContent}" title-style="h1" map-name="dummy">
             <display description=""/>
         </field>
-        <field name="contentId" position="1"
+        <field name="contentId" position="1"
             use-when="&quot;${currentValue.contentId}&quot;.length()>0" >
             <display />
         </field>
 
-        <field name="contentId" position="1"
+        <field name="contentId" position="1"
             use-when="&quot;${currentValue.contentId}&quot;.length()==0" >
             <text />
         </field>
@@ -582,7 +594,7 @@
         <field name="submitButton" title="${uiLabelMap.CommonUpload}" widget-style="smallSubmit">
             <submit button-type="button"/>
         </field>
-        
+
         <field name="MASTER_contentId" ><hidden value="${MASTER_contentId}" /></field>
         <field name="MASTER_caContentId" ><hidden value="${MASTER_caContentId}" /></field>
         <field name="MASTER_caContentIdTo" ><hidden value="${MASTER_caContentIdTo}" /></field>

Modified: ofbiz/trunk/applications/content/webapp/content/contentsetup/ContentSetupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/contentsetup/ContentSetupForms.xml?rev=759466&r1=759465&r2=759466&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/contentsetup/ContentSetupForms.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/contentsetup/ContentSetupForms.xml Sat Mar 28 14:20:15 2009
@@ -208,7 +208,13 @@
         </actions>
         <auto-fields-service service-name="updateContentPurposeOperation" default-field-type="display"/>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentPurposeOperation?contentPurposeTypeId=${contentPurposeTypeId}&amp;contentOperationId=${contentOperationId}&amp;roleTypeId=${roleTypeId}&amp;statusId=${statusId}&amp;privilegeEnumId=${privilegeEnumId}"/>
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentPurposeOperation">
+ <parameter param-name="contentPurposeTypeId" from-field="contentPurposeTypeId"/>
+ <parameter param-name="contentOperationId" from-field="contentOperationId"/>
+ <parameter param-name="roleTypeId" from-field="roleTypeId"/>
+ <parameter param-name="statusId" from-field="statusId"/>
+ <parameter param-name="privilegeEnumId" from-field="privilegeEnumId"/>
+ </hyperlink>
         </field>
     </form>
 </forms>
\ No newline at end of file

Modified: ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml?rev=759466&r1=759465&r2=759466&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml Sat Mar 28 14:20:15 2009
@@ -160,7 +160,13 @@
             <hyperlink also-hidden="false" description="${contentId}" target="EditLayout?contentId=${contentId}&amp;drDataResourceId=${drDataResourceId}"/>
         </field>
         <field name="dummy" title="${uiLabelMap.ContentClip}" widget-style="buttontext" map-name="dummy">
-            <hyperlink also-hidden="false" description="${contentId}" target="clipFindLayout?contentId=${contentId}&amp;drDataResourceId=${drDataResourceId}&amp;viewSize=${viewSize}&amp;viewIndex=${viewIndex}&amp;entityName=${entityName}"/>
+            <hyperlink also-hidden="false" description="${contentId}" target="clipFindLayout">
+ <parameter param-name="contentId" from-field="contentId"/>
+ <parameter param-name="drDataResourceId" from-field="drDataResourceId"/>
+ <parameter param-name="viewSize" from-field="viewSize"/>
+ <parameter param-name="viewIndex" from-field="viewIndex"/>
+ <parameter param-name="entityName" from-field="entityName"/>
+ </hyperlink>
         </field>
         <field name="contentName"><display/></field>
         <field name="description"><display/></field>

Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml?rev=759466&r1=759465&r2=759466&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml Sat Mar 28 14:20:15 2009
@@ -153,7 +153,13 @@
         <field name="oldDataResourceId"><display/></field>
         <field name="newDataResourceId"><display/></field>
         <field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditContentRevisionItem?contentId=${contentId}&amp;contentRevisionSeqId=${contentRevisionSeqId}&amp;itemContentId=${itemContentId}&amp;rootContentId=${rootContentId}&amp;rootContentRevisionSeqId=${rootContentRevisionSeqId}"/>
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditContentRevisionItem">
+ <parameter param-name="contentId" from-field="contentId"/>
+ <parameter param-name="contentRevisionSeqId" from-field="contentRevisionSeqId"/>
+ <parameter param-name="itemContentId" from-field="itemContentId"/>
+ <parameter param-name="rootContentId" from-field="rootContentId"/>
+ <parameter param-name="rootContentRevisionSeqId" from-field="rootContentRevisionSeqId"/>
+ </hyperlink>
         </field>
         <field name="create" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
             <hyperlink also-hidden="false" description="${uiLabelMap.CommonCreate}" target="EditContentRevisionItem?contentId=${contentId}&amp;contentRevisionSeqId=${contentRevisionSeqId}&amp;rootContentId=${rootContentId}&amp;rootContentRevisionSeqId=${rootContentRevisionSeqId}"/>
@@ -472,7 +478,13 @@
         <field name="contentApprovalId"><display/></field>
 
         <field name="editLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="approvalCount &gt; 0">
-            <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditContentRevisionItem?contentId=${contentId}&amp;contentRevisionSeqId=${contentRevisionSeqId}&amp;itemContentId=${itemContentId}&amp;rootContentId=${rootContentId}&amp;rootContentRevisionSeqId=${rootContentRevisionSeqId}"/>
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditContentRevisionItem">
+ <parameter param-name="contentId" from-field="contentId"/>
+ <parameter param-name="contentRevisionSeqId" from-field="contentRevisionSeqId"/>
+ <parameter param-name="itemContentId" from-field="itemContentId"/>
+ <parameter param-name="rootContentId" from-field="rootContentId"/>
+ <parameter param-name="rootContentRevisionSeqId" from-field="rootContentRevisionSeqId/>
+ </hyperlink>
         </field>
         <field name="create" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
             <hyperlink also-hidden="false" description="Create" target="EditContentRevisionItem"/>

Modified: ofbiz/trunk/applications/content/widget/forum/ForumForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/ForumForms.xml?rev=759466&r1=759465&r2=759466&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/forum/ForumForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/forum/ForumForms.xml Sat Mar 28 14:20:15 2009
@@ -17,8 +17,8 @@
 specific language governing permissions and limitations
 under the License.
 -->
-    
-    <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
+    <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
     <form name="ListForumGroups" type="list" list-name="forumGroups" separate-columns="true"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
@@ -34,7 +34,7 @@
         <field name="contentTypeId"><hidden value="FORUM_ROOT"/></field>
         <field name="submitButton" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
-    
+
     <form name="ListForums" type="list" list-name="forums"  separate-columns="true" target="updateForum"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <field name="forumGroupId"><hidden value="${parameters.forumGroupId}"/></field>
@@ -46,7 +46,16 @@
         <field name="forumDescription" entry-name="description" parameter-name="description"><text/></field>
         <field name="thruDate" entry-name="caThruDate"><date-time/></field>
         <field name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext"><submit button-type="text-link"/></field>
-        <field name="deleteButton" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"><hyperlink target="updateForum?forumGroupId=${parameters.forumGroupId}&amp;contentIdTo=${parameters.forumGroupId}&amp;contentId=${contentId}&amp;contentAssocTypeId=${caContentAssocTypeId}&amp;fromDate=${caFromDate}&amp;deactivateExisting=yes" description="${uiLabelMap.CommonDelete}"/></field>
+        <field name="deleteButton" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
+            <hyperlink target="updateForum">
+ <parameter param-name="forumGroupId" from-field="parameters.forumGroupId"/>
+ <parameter param-name="contentIdTo" from-field="parameters.forumGroupId"/>
+ <parameter param-name="contentId" from-field="contentId"/>
+ <parameter param-name="contentAssocTypeId" from-field="caContentAssocTypeId"/>
+ <parameter param-name="fromDate" from-field="caFromDate"/>
+ <parameter param-name="deactivateExisting" value="yes"/>
+ </hyperlink>
+        </field>
         <field name="fromDate" entry-name="caFromDate"><display description="${bsh:caFromDate.toString().substring(0,10)}"/></field>
         <field name="nbrOfMessages" entry-name="childBranchCount"><display/></field>
     </form>
@@ -62,7 +71,7 @@
         <field name="caContentAssocTypeId"><hidden value="SUBSITE"/></field>
         <field name="addButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
-    
+
     <form name="ForumGroupPurposes" type="list" list-name="forumPurposes" target="deleteForumGroupPurpose" separate-columns="true"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <auto-fields-entity entity-name="ContentPurpose" default-field-type="edit"/>
@@ -78,11 +87,11 @@
         <field name="contentId"><hidden value="${parameters.forumGroupId}"/></field>
         <field name="contentPurposeTypeId">
             <drop-down>
-                <entity-options entity-name="ContentPurposeType" description="${description}"></entity-options>    
+                <entity-options entity-name="ContentPurposeType" description="${description}"></entity-options>
             </drop-down></field>
         <field name="addButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
-    
+
     <form name="ForumGroupRoles" type="list" list-name="forumRoles" target="updateForumGroupRole" separate-columns="true"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <auto-fields-entity entity-name="ContentRole" default-field-type="edit"/>
@@ -111,11 +120,11 @@
         </field>
         <field name="roleTypeId">
             <drop-down>
-                <entity-options entity-name="RoleType" description="${description}"></entity-options>    
+                <entity-options entity-name="RoleType" description="${description}"></entity-options>
             </drop-down></field>
         <field name="addButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
-    
+
     <form name="ListForumMessages" type="list" list-name="forumMessages" separate-columns="true" target="updateForumMessage"
         odd-row-style="alternate-row" default-table-style="basic-table">
         <row-actions>
@@ -146,7 +155,7 @@
         <field position="7" name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext"><submit button-type="text-link"/></field>
         <field position="8" name="responseButton" title="${uiLabelMap.FormFieldTitle_reponse}" widget-style="buttontext"><hyperlink target="addForumMessage?forumGroupId=${parameters.forumGroupId}&amp;forumId=${parameters.forumId}&amp;forumMessageIdTo=${contentId}&amp;contentAssocTypeId=RESPONSE" description="${uiLabelMap.FormFieldTitle_reponse}"/></field>
     </form>
-    
+
     <form name="EditForumMessage" type="single" target="updateForumMessage" default-map-name="message"
         header-row-style="header-row" default-table-style="basic-table">
         <actions>
@@ -199,7 +208,7 @@
     </form>
     <form name="AddForumThreadMessage" type="single" extends="AddForumMessage" target="updateForumThreadMessage"
         header-row-style="header-row" default-table-style="basic-table"/>
-    
+
     <form name="EditForumThreadMessage" type="single" target="updateForumThreadMessage"
         header-row-style="header-row" default-table-style="basic-table">
         <field name="forumGroupId"><hidden value="${parameters.forumGroupId}"/></field>
@@ -217,4 +226,4 @@
         <field name="textData" title="${uiLabelMap.FormFieldTitle_textDataTitle}"><textarea rows="8"/></field>
         <field name="updateButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
     </form>
-</forms>
\ No newline at end of file
+    </forms>
\ No newline at end of file

Modified: ofbiz/trunk/framework/common/widget/PortalPageForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortalPageForms.xml?rev=759466&r1=759465&r2=759466&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/PortalPageForms.xml (original)
+++ ofbiz/trunk/framework/common/widget/PortalPageForms.xml Sat Mar 28 14:20:15 2009
@@ -78,7 +78,13 @@
     <form name="PortletCategoryAndPortlet" type="list" list-name="portletCat" paginate-target="AddPortlet" separate-columns="true"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <field name="portletCategoryId" title="Category">
-            <hyperlink description="${portletCategoryId}" target="AddPortlet?portletCategoryId=${portletCategoryId}&amp;portalPortletId=${portalPortletId}&amp;portalPageId=${parameters.portalPageId}&amp;columnSeqId=${parameters.columnSeqId}&amp;parentPortalPageId=${parameters.parentPortalPageId}"/>
+            <hyperlink description="${portletCategoryId}" target="AddPortlet">
+ <parameter param-name="portletCategoryId" from-field="portletCategoryId"/>
+ <parameter param-name="portalPortletId" from-field="portalPortletId"/>
+ <parameter param-name="portalPageId" from-field="parameters.portalPageId"/>
+ <parameter param-name="columnSeqId" from-field="parameters.columnSeqId"/>
+ <parameter param-name="parentPortalPageId" from-field="parameters.parentPortalPageId"/>
+ </hyperlink>
         </field>
         <field name="description" title="${uiLabelMap.CommonDescription}" field-name="${description}"><display/></field>
     </form>

Modified: ofbiz/trunk/specialpurpose/oagis/widget/forms/MessageInfoForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/widget/forms/MessageInfoForms.xml?rev=759466&r1=759465&r2=759466&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/widget/forms/MessageInfoForms.xml (original)
+++ ofbiz/trunk/specialpurpose/oagis/widget/forms/MessageInfoForms.xml Sat Mar 28 14:20:15 2009
@@ -69,7 +69,13 @@
         </actions>
         <auto-fields-entity entity-name="OagisMessageErrorInfo" default-field-type="display"/>
         <field name="logicalId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="${logicalId}" target="EditMessageErrorInfo?logicalId=${logicalId}&amp;component=${component}&amp;task=${task}&amp;referenceId=${referenceId}&amp;errorSeqId=${errorSeqId}"/>
+            <hyperlink also-hidden="false" description="${logicalId}" target="EditMessageErrorInfo">
+ <parameter param-name="logicalId" from-field="logicalId"/>
+ <parameter param-name="component" from-field="component"/>
+ <parameter param-name="task" from-field="task"/>
+ <parameter param-name="referenceId" from-field="referenceId"/>
+ <parameter param-name="errorSeqId" from-field="errorSeqId"/>
+ </hyperlink>
         </field>
     </form>
     

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=759466&r1=759465&r2=759466&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Sat Mar 28 14:20:15 2009
@@ -7,9 +7,9 @@
     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
@@ -20,7 +20,7 @@
 
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
-    
+
     <form name="EditTask" type="single" target="updateTask" default-map-name="task"
         header-row-style="header-row" default-table-style="basic-table">
         <alt-target use-when="myTask!=void &amp;&amp; parameters.get(&quot;workEffortParentId&quot;)!=null" target="createMyTask"/>
@@ -31,7 +31,7 @@
         <field name="statusId"><hidden value="PAS_ASSIGNED"/></field>
         <field name="partyId" use-when="myTask!=void"><hidden value="${userLogin.partyId}"/></field>
         <field name="projectId"><hidden value="${parameters.projectId}"/></field>
-        <field name="workEffortTypeId"><hidden value="TASK"/></field>
+        <field name="workEffortTypeId"><hidden value="TASK"/></field>
         <field name="workEffortName" title="${uiLabelMap.ProjectMgrTaskName}*" tooltip="${uiLabelMap.CommonRequired}"><text/></field>
         <field name="workEffortParentId" use-when="myTask==void&amp;&amp;projectId!=void" title="${uiLabelMap.ProjectMgrTaskPhase}*" tooltip="${uiLabelMap.CommonRequired}">
             <drop-down allow-empty="true">
@@ -39,7 +39,7 @@
                     <entity-constraint name="workEffortTypeId" value="PHASE"/>
                     <entity-constraint name="workEffortParentId" value="${projectId}"/>
                     <entity-order-by field-name="workEffortParentId"/>
-                </entity-options>        
+                </entity-options>
             </drop-down>
         </field>
         <field name="workEffortParentId" use-when="myTask==void&amp;&amp;projectId==void" title="${uiLabelMap.ProjectMgrTaskPhase}*" tooltip="${uiLabelMap.CommonRequired}">
@@ -48,7 +48,7 @@
                     <entity-constraint name="partyId" env-name="userLogin.partyId"/>
                     <entity-order-by field-name="projectName"/>
                     <entity-order-by field-name="phaseName"/>
-                </entity-options>        
+                </entity-options>
             </drop-down>
         </field>
         <field name="workEffortParentId" use-when="myTask!=void&amp;&amp;parameters.get(&quot;workEffortParentId&quot;)!=null" title="${uiLabelMap.ProjectMgrTaskPhase}*">
@@ -62,7 +62,7 @@
                     <entity-constraint name="partyId" env-name="userLogin.partyId"/>
                     <entity-order-by field-name="projectName"/>
                     <entity-order-by field-name="phaseName"/>
-                </entity-options>        
+                </entity-options>
             </drop-down>
         </field>
         <field name="roleTypeId" use-when="myTask!=void" title="${uiLabelMap.ProjectMgrMyRoleForThisTask}">
@@ -77,22 +77,22 @@
         <field name="estimatedHours" use-when="myTask!=void" title="${uiLabelMap.ProjectMgrEstimatedHours}"><text size="5"/></field>
         <field name="skillTypeId" use-when="myTask!=void" title="${uiLabelMap.HumanResSkillTypeId}">
             <drop-down allow-empty="true">
-                <entity-options entity-name="SkillType" description="${description}"/>        
+                <entity-options entity-name="SkillType" description="${description}"/>
             </drop-down>
         </field>
         <field name="currentStatusId" use-when="task!=null&amp;&amp;task!=void"><hidden/></field>
         <field name="currentStatusId" use-when="task==null||task==void"><hidden value="PTS_CREATED"/></field>
         <field name="priority" title="${uiLabelMap.CommonPriority}">
             <drop-down allow-empty="true" current="selected">
-                <option key="1" description="${uiLabelMap.WorkEffortPriorityOne}"/>
-                <option key="2" description="${uiLabelMap.WorkEffortPriorityTwo}"/>
-                <option key="3" description="${uiLabelMap.WorkEffortPriorityThree}"/>
-                <option key="4" description="${uiLabelMap.WorkEffortPriorityFour}"/>
-                <option key="5" description="${uiLabelMap.WorkEffortPriorityFive}"/>
-                <option key="6" description="${uiLabelMap.WorkEffortPrioritySix}"/>
-                <option key="7" description="${uiLabelMap.WorkEffortPrioritySeventh}"/>
-                <option key="8" description="${uiLabelMap.WorkEffortPriorityEight}"/>
-                <option key="9" description="${uiLabelMap.WorkEffortPriorityNine}"/>
+                <option key="1" description="${uiLabelMap.WorkEffortPriorityOne}"/>
+                <option key="2" description="${uiLabelMap.WorkEffortPriorityTwo}"/>
+                <option key="3" description="${uiLabelMap.WorkEffortPriorityThree}"/>
+                <option key="4" description="${uiLabelMap.WorkEffortPriorityFour}"/>
+                <option key="5" description="${uiLabelMap.WorkEffortPriorityFive}"/>
+                <option key="6" description="${uiLabelMap.WorkEffortPrioritySix}"/>
+                <option key="7" description="${uiLabelMap.WorkEffortPrioritySeventh}"/>
+                <option key="8" description="${uiLabelMap.WorkEffortPriorityEight}"/>
+                <option key="9" description="${uiLabelMap.WorkEffortPriorityNine}"/>
             </drop-down>
         </field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><textarea/></field>
@@ -128,7 +128,7 @@
         <field name="phaseDdescription" parameter-name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
         <field name="save" title="${uiLabelMap.CommonSave}"><submit/></field>
     </form>
-    <form name="FindTask" type="single" target="FindTask"
+    <form name="FindTask" type="single" target="FindTask"
         header-row-style="header-row" default-table-style="basic-table">
         <field name="workEffortTypeId"><hidden value="TASK"/></field>
         <field name="workEffortId"  title="${uiLabelMap.ProjectMgrTaskId}"><text-find default-option="contains" ignore-case="true"/></field>
@@ -151,7 +151,7 @@
                     <entity-constraint name="statusId" operator="not-equals" value="PARTY_DISABLED"/>
                     <entity-order-by field-name="lastName"/>
                     <entity-order-by field-name="groupName"/>
-                </entity-options>    
+                </entity-options>
             </drop-down>
         </field>
         <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}"><text-find default-option="contains" ignore-case="true"/></field>
@@ -226,7 +226,7 @@
                 <entity-options entity-name="PartyDetailAndWorkEffortAssign" description="${firstName} ${middleName} ${lastName} ${groupName}">
                     <entity-constraint name="workEffortId" env-name="resultProject.projectId"/>
                     <entity-constraint name="workEffortTypeId" value="PROJECT"/>
-                </entity-options>    
+                </entity-options>
             </drop-down>
         </field>
         <field name="roleTypeId" parameter-name="newRoleTypeId" title="${uiLabelMap.PartyRole}">
@@ -234,7 +234,7 @@
                 <entity-options entity-name="RoleType" description="${description}">
                     <entity-constraint name="parentTypeId" value="PROJECT_TEAM"/>
                     <entity-order-by field-name="description"/>
-                </entity-options>        
+                </entity-options>
             </drop-down>
         </field>
         <field name="workEffortId"><hidden/></field>
@@ -257,9 +257,9 @@
                 <entity-options entity-name="ProjectPartyAndPhaseAndTask" description="${projectName} -- ${phaseName} -- ${workEffortName}" key-field-name="workEffortId" filter-by-date="true">
                     <entity-constraint name="partyId" operator="equals" value="${parameters.userLogin.partyId}"/>
                     <entity-constraint name="currentStatusId" operator="equals" value="PTS_CREATED"/>
-                    <entity-order-by field-name="projectName"/>    
-                    <entity-order-by field-name="phaseName"/>    
-                    <entity-order-by field-name="workEffortName"/>    
+                    <entity-order-by field-name="projectName"/>
+                    <entity-order-by field-name="phaseName"/>
+                    <entity-order-by field-name="workEffortName"/>
                 </entity-options>
            </drop-down>
         </field>
@@ -286,7 +286,7 @@
         <field name="fromDate"><hidden/></field>
         <field name="workEffortId"><hidden/></field>
         <field name="workEffortIdFrom" title="${uiLabelMap.CommonName}"><hyperlink target="Dependencies?workEffortId=${workEffortIdFrom}" description="${r.taskInfo.taskName}"/></field>
-        <field name="workEffortParentId" entry-name="r.taskInfo.workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"/></field>        
+        <field name="workEffortParentId" entry-name="r.taskInfo.workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"/></field>
         <field name="currentStatusId" entry-name="r.taskInfo.currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
         <field name="estimatedStartDate" entry-name="r.taskInfo.estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/></field>
         <field name="estimatedCompletionDate"  entry-name="r.taskInfo.estimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"><display type="date"/></field>
@@ -306,7 +306,7 @@
         <field name="fromDate"><hidden/></field>
         <field name="workEffortId"><hidden/></field>
         <field name="workEffortIdTo" title="${uiLabelMap.CommonName}"><hyperlink target="Dependencies?workEffortId=${workEffortIdTo}" description="${r.taskInfo.taskName}"/></field>
-        <field name="workEffortParentId" entry-name="r.taskInfo.workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"/></field>        
+        <field name="workEffortParentId" entry-name="r.taskInfo.workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"/></field>
         <field name="currentStatusId" entry-name="r.taskInfo.currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
         <field name="estimatedStartDate" entry-name="r.taskInfo.estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/></field>
         <field name="estimatedCompletionDate"  entry-name="r.taskInfo.estimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"><display type="date"/></field>
@@ -360,12 +360,12 @@
         <field name="estimatedDuration" title="${uiLabelMap.ProjectMgrEstimatedDuration}"><text/></field>
         <field name="estimatedCost" title="${uiLabelMap.ProjectMgrEstimatedCost}" widget-style="linktext"><text/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
-    </form>
+    </form>
     <form name="AddTaskSkill" type="single" target="createTaskSkillStandard"
         header-row-style="header-row" default-table-style="basic-table">
         <field name="workEffortId"><hidden value="${workEffortId}"/></field>
         <field name="skillTypeId"><drop-down>
-            <entity-options entity-name="SkillType" description="${description}"/>    
+            <entity-options entity-name="SkillType" description="${description}"/>
         </drop-down>
         </field>
         <field name="estimatedNumPeople" title="${uiLabelMap.ProjectMgrEstimatedNumPeople}"><text/></field>
@@ -384,7 +384,7 @@
                 <order-by field-name="-fromDate"/>
             </entity-condition>
         </actions>
-        <auto-fields-service service-name="updateTimeEntry"/>        
+        <auto-fields-service service-name="updateTimeEntry"/>
         <field name="fixedAssetId"><hidden/></field>
         <field name="maintHistSeqId"><hidden/></field>
         <field name="timeEntryId"><hidden/></field>
@@ -414,7 +414,7 @@
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
             <hyperlink target="deleteTimeEntry?workEffortId=${workEffortId}&amp;timeEntryId=${timeEntryId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
         </field>
-    </form>
+    </form>
     <form name="createTimeEntry" type="single" target="createTimeEntry" header-row-style="header-row" default-table-style="basic-table">
         <field name="fromDate" title="${uiLabelMap.CommonDate}"><date-time type="date"/></field>
         <field name="hours"><text size="10"/></field>
@@ -430,7 +430,7 @@
                 <entity-options entity-name="RoleType" description="${description}">
                     <entity-constraint name="parentTypeId" value="PROJECT_TEAM"/>
                     <entity-order-by field-name="description"/>
-                </entity-options>        
+                </entity-options>
             </drop-down>
         </field>
         <field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
@@ -443,7 +443,7 @@
         <field name="comments"><text size="40"/></field>
         <field name="workEffortId"><hidden value="${parameters.workEffortId}"/></field>
         <field name="addButton" title="${uiLabelMap.CommonAdd}"><submit/></field>
-    </form>    
+    </form>
     <form name="ListTaskNotes" extends="ListWorkEffortNotes" extends-resource="component://workeffort/widget/WorkEffortForms.xml" type="list" list-name="taskNotes" paginate-target="EditTaskNotes"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
@@ -455,7 +455,7 @@
         <field name="noteId"><hidden/></field>
         <field name="workEffortId"><hidden/></field>
         <field name="noteParty" title="${uiLabelMap.CommonBy}"><display description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, noteParty, true)} at ${bsh: org.ofbiz.base.util.UtilDateTime.timeStampToString(noteDateTime, &quot;dd-MM-yyyy HH:mm&quot;, TimeZone.getDefault(), context.get(&quot;locale&quot;))}"/></field>
-    
+
         <field name="Private/Public" widget-style="buttontext" title="${uiLabelMap.ProjectMgrPrivateOrPublic}" use-when="internalNote.equals(&quot;N&quot;)">
             <hyperlink target="updateTaskNote?workEffortId=${workEffortId}&amp;noteId=${noteId}&amp;internalNote=Y" description="${uiLabelMap.OrderNotesPrivate}"></hyperlink>
         </field>
@@ -480,7 +480,7 @@
         <field name="plannedHours"><display/></field>
         <field name="originalActualHours"><display/></field>
         <field name="actualHours"><display/></field>
-    </form>                                        
+    </form>
     <form name="EditWorkEffortPartyAssigns" target="deleteTaskPartyAssign" title="" type="list" paginate-target="EditTaskPartyAssigns"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
@@ -503,20 +503,28 @@
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display type="date"/></field>
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display type="date"/></field>
         <field name="deleteButton" widget-style="smallSubmit"><submit button-type="button"/></field>
-        <field name="complete"><hyperlink description="${uiLabelMap.ProjectMgrToComplete}" target="updateTaskPartyAssign?workEffortId=${workEffortId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;fromDate=${fromDate}&amp;statusId=PAS_COMPLETED&amp;thruDate=${nowDate}"/></field>
+        <field name="complete"><hyperlink description="${uiLabelMap.ProjectMgrToComplete}" target="updateTaskPartyAssign">
+ <parameter param-name="workEffortId" from-field="workEffortId"/>
+ <parameter param-name="partyId" from-field="partyId"/>
+ <parameter param-name="roleTypeId" from-field="roleTypeId"/>
+ <parameter param-name="fromDate" from-field="fromDate"/>
+ <parameter param-name="statusId" value="PAS_COMPLETED"/>
+ <parameter param-name="thruDate" from-field="nowDate"/>
+ </hyperlink>
+    </field>
     </form>
     <form name="ListTaskParties" type="list" list-name="taskParties"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="partyId" title="${uiLabelMap.CommonName}">
             <hyperlink target="viewprofile?partyId=${partyId}" description="${partyName}"/>
         </field>
-        <field name="roleTypeId" title="${uiLabelMap.ProjectMgrPartyRoleTypeId}"><display-entity entity-name="RoleType" description="${description}"/></field>        
-        <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" description="${description}"/></field>        
+        <field name="roleTypeId" title="${uiLabelMap.ProjectMgrPartyRoleTypeId}"><display-entity entity-name="RoleType" description="${description}"/></field>
+        <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" description="${description}"/></field>
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display type="date"/></field>
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display type="date"/></field>
-        <field name="originalActualHours"><display/></field>
-        <field name="actualHours"><display/></field>
-    </form>  
+        <field name="originalActualHours"><display/></field>
+        <field name="actualHours"><display/></field>
+    </form>
     <form name="ListTaskContent" type="list" paginate-target="/ListCommContent"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
@@ -525,7 +533,7 @@
             </entity-and>
         </actions>
         <field name="contentName" widget-style="smallSubmit">
-            <hyperlink also-hidden="false" description="${contentName} [${contentId}]" target="ViewSimpleContent?contentId=${contentId}&amp;dataResourceId=${dataResourceId}&amp;communicationEventId=${communicationEventId}&amp;fromDate=${fromDate}"/>
+            <hyperlink also-hidden="false" description="${contentName} [${contentId}]" target="ViewSimpleContent?contentId=${contentId}&amp;dataResourceId=${dataResourceId}&amp;communicationEventId=${communicationEventId}&amp;fromDate=${fromDate}"/>
         </field>
         <field name="contentTypeId"><display-entity entity-name="ContentType" description="${description}"/></field>
         <field name="workEffortContentTypeId"><display-entity entity-name="WorkEffortContentType" description="${description}"/></field>
@@ -544,7 +552,7 @@
         <field name="description"><display/></field>
         <field name="custRequestTypeDescription"><display/></field>
         <field name="statusItemDescription"><display/></field>
-    </form>
+    </form>
     <form name="TaskBefore" target="removeDependency" title="" list-name="depList" type="list" separate-columns="true" paginate-target="taskView"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <row-actions>
@@ -561,7 +569,7 @@
         <field name="fromDate"><hidden/></field>
         <field name="workEffortId"><hidden/></field>
         <field name="workEffortIdFrom" title="${uiLabelMap.CommonName}"><hyperlink target="Dependencies?workEffortId=${workEffortIdFrom}" description="${result.taskInfo.taskName}"/></field>
-        <field name="workEffortParentId" entry-name="result.taskInfo.workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"/></field>        
+        <field name="workEffortParentId" entry-name="result.taskInfo.workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"/></field>
         <field name="currentStatusId" entry-name="result.taskInfo.currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
         <field name="estimatedStartDate" entry-name="result.taskInfo.estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/></field>
         <field name="estimatedCompletionDate"  entry-name="result.taskInfo.estimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"><display type="date"/></field>
@@ -584,25 +592,25 @@
         <field name="fromDate"><hidden/></field>
         <field name="workEffortId"><hidden/></field>
         <field name="workEffortIdTo" title="${uiLabelMap.CommonName}"><hyperlink target="Dependencies?workEffortId=${workEffortIdFrom}" description="${result.taskInfo.taskName}"/></field>
-        <field name="workEffortParentId" entry-name="result.taskInfo.workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"/></field>        
+        <field name="workEffortParentId" entry-name="result.taskInfo.workEffortParentId" title="${uiLabelMap.ProjectMgrTaskPhase}"><display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${workEffortName}"/></field>
         <field name="currentStatusId" entry-name="result.taskInfo.currentStatusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
         <field name="estimatedStartDate" entry-name="result.taskInfo.estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><display type="date"/></field>
         <field name="estimatedCompletionDate"  entry-name="result.taskInfo.estimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"><display type="date"/></field>
         <field name="actualStartDate" entry-name="result.taskInfo.actualStartDate" title="${uiLabelMap.FormFieldTitle_actualStartDate}"><display type="date"/></field>
         <field name="actualCompletionDate"  entry-name="result.taskInfo.actualCompletionDate" title="${uiLabelMap.FormFieldTitle_actualCompletionDate}"><display type="date"/></field>
-    </form>    
+    </form>
     <form name="EditTaskFromRequest" type="single" target="CreateTaskFromRequest">
         <field name="custRequestId"><hidden value="${parameters.custRequestId}"/></field>
         <field name="projectId"><hidden value="${parameters.projectId}"/></field>
-        <field name="workEffortTypeId"><hidden value="TASK"/></field>
+        <field name="workEffortTypeId"><hidden value="TASK"/></field>
         <field name="currentStatusId"><hidden value="PTS_CREATED"/></field>
         <field name="taskName" parameter-name="workEffortName" title="${uiLabelMap.ProjectMgrTaskName}*" tooltip="${uiLabelMap.CommonRequired}"><text default-value="${custRequest.custRequestName}"/></field>
         <field name="taskDescription" parameter-name="description" title="${uiLabelMap.CommonDescription}"><text default-value="${custRequest.description}"/></field>
         <field name="childWorkEffortId" parameter-name="workEffortParentId" title="${uiLabelMap.ProjectMgrProjectAndPhaseName}*">
             <drop-down allow-empty="false">
                 <entity-options entity-name="WorkEffortAndChild" description="${workEffortName} -- ${childWorkEffortName}">
-                    <entity-constraint name="workEffortTypeId" value="PROJECT"/>    
-                    <entity-constraint name="childWorkEffortTypeId" value="PHASE"/>    
+                    <entity-constraint name="workEffortTypeId" value="PROJECT"/>
+                    <entity-constraint name="childWorkEffortTypeId" value="PHASE"/>
                     <entity-order-by field-name="workEffortName"/>
                     <entity-order-by field-name="childWorkEffortName"/>
                 </entity-options>
@@ -610,15 +618,15 @@
         </field>
         <field name="taskPriority" parameter-name="priority" title="${uiLabelMap.CommonPriority}">
             <drop-down allow-empty="true" current="selected">
-                <option key="1" description="${uiLabelMap.WorkEffortPriorityOne}"/>
-                <option key="2" description="${uiLabelMap.WorkEffortPriorityTwo}"/>
-                <option key="3" description="${uiLabelMap.WorkEffortPriorityThree}"/>
-                <option key="4" description="${uiLabelMap.WorkEffortPriorityFour}"/>
-                <option key="5" description="${uiLabelMap.WorkEffortPriorityFive}"/>
-                <option key="6" description="${uiLabelMap.WorkEffortPrioritySix}"/>
-                <option key="7" description="${uiLabelMap.WorkEffortPrioritySeventh}"/>
-                <option key="8" description="${uiLabelMap.WorkEffortPriorityEight}"/>
-                <option key="9" description="${uiLabelMap.WorkEffortPriorityNine}"/>
+                <option key="1" description="${uiLabelMap.WorkEffortPriorityOne}"/>
+                <option key="2" description="${uiLabelMap.WorkEffortPriorityTwo}"/>
+                <option key="3" description="${uiLabelMap.WorkEffortPriorityThree}"/>
+                <option key="4" description="${uiLabelMap.WorkEffortPriorityFour}"/>
+                <option key="5" description="${uiLabelMap.WorkEffortPriorityFive}"/>
+                <option key="6" description="${uiLabelMap.WorkEffortPrioritySix}"/>
+                <option key="7" description="${uiLabelMap.WorkEffortPrioritySeventh}"/>
+                <option key="8" description="${uiLabelMap.WorkEffortPriorityEight}"/>
+                <option key="9" description="${uiLabelMap.WorkEffortPriorityNine}"/>
             </drop-down>
         </field>
         <field name="taskScopeEnumId" parameter-name="scopeEnumId" title="${uiLabelMap.ProjectMgrWorkEffortScopeEnumId}">
@@ -632,7 +640,7 @@
         <field name="estimatedStartDate" title="${uiLabelMap.FormFieldTitle_estimatedStartDate}"><date-time type="date"/></field>
         <field name="estimatedCompletionDate" title="${uiLabelMap.FormFieldTitle_estimatedCompletionDate}"><date-time type="date"/></field>
         <field name="save" title="${uiLabelMap.CommonSave}"><submit/></field>
-    </form>                            
+    </form>
     <form name="CreateCustRequestWorkEffortByExistingTaskForm" type="single" target="acceptRequestAndConnectToTask">
         <field name="custRequestId"><hidden value="${parameters.custRequestId}"/></field>
         <field name="statusId"><hidden value="CRQ_ACCEPTED"/></field>
@@ -647,5 +655,5 @@
             </drop-down>
           </field>
         <field name="save" title="${uiLabelMap.CommonSave}"><submit/></field>
-    </form>    
+    </form>
 </forms>
\ No newline at end of file