svn commit: r699207 - in /ofbiz/trunk/specialpurpose/mypage: templates/email/CompletedCustRequestNotification.ftl templates/email/CreateCustRequestNotification.ftl widget/CommonScreens.xml widget/MyPageForms.xml

[hansbak-2]

Author: hansbak
Date: Fri Sep 26 01:08:11 2008
New Revision: 699207

URL: http://svn.apache.org/viewvc?rev=699207&view=rev
Log:
small adjustments to the mypage screens

Modified:
    ofbiz/trunk/specialpurpose/mypage/templates/email/CompletedCustRequestNotification.ftl
    ofbiz/trunk/specialpurpose/mypage/templates/email/CreateCustRequestNotification.ftl
    ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml
    ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml

Modified: ofbiz/trunk/specialpurpose/mypage/templates/email/CompletedCustRequestNotification.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/templates/email/CompletedCustRequestNotification.ftl?rev=699207&r1=699206&r2=699207&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/templates/email/CompletedCustRequestNotification.ftl (original)
+++ ofbiz/trunk/specialpurpose/mypage/templates/email/CompletedCustRequestNotification.ftl Fri Sep 26 01:08:11 2008
@@ -29,7 +29,7 @@
         <p>Your Customer Request ${custRequest.custRequestName?if_exists} [${custRequest.custRequestId}] has been completed.
         <br/><br/>
         The status and used hours can always be checked at the url: <br/>
-        ${baseUrl?if_exists}/mypage/control/ViewRequest?custRequestId=${custRequest.custRequestId}
+        <a href="${baseUrl?if_exists}/mypage/control/ViewRequest?custRequestId=${custRequest.custRequestId}">${baseUrl?if_exists}/mypage/control/ViewRequest?custRequestId=${custRequest.custRequestId}</a>
         <br/><br/>
         Regards.<br/><br/>
         Thank you for your business.

Modified: ofbiz/trunk/specialpurpose/mypage/templates/email/CreateCustRequestNotification.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/templates/email/CreateCustRequestNotification.ftl?rev=699207&r1=699206&r2=699207&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/templates/email/CreateCustRequestNotification.ftl (original)
+++ ofbiz/trunk/specialpurpose/mypage/templates/email/CreateCustRequestNotification.ftl Fri Sep 26 01:08:11 2008
@@ -31,7 +31,7 @@
         We will solve/implement the request as soon as possible
         <br/><br/>
         The status and used hours can always be checked at the url: <br/>
-        ${baseUrl?if_exists}/mypage/control/ViewRequest?custRequestId=${custRequest.custRequestId}
+        <a href="${baseUrl?if_exists}/mypage/control/ViewRequest?custRequestId=${custRequest.custRequestId}">${baseUrl?if_exists}/mypage/control/ViewRequest?custRequestId=${custRequest.custRequestId}</a>
         <br/><br/>
         Regards.
         <br/><br/>

Modified: ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml?rev=699207&r1=699206&r2=699207&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml Fri Sep 26 01:08:11 2008
@@ -295,7 +295,10 @@
                 <entity-condition list-name="custRequestsCompleted" entity-name="CustRequestInfoAndWorkEffortAndPartyRel">
                     <condition-list combine="and">
                         <condition-expr field-name="fromPartyId" operator="equals" value="${userLogin.partyId}"/>
-                        <condition-expr field-name="statusId" operator="equals" value="CRQ_COMPLETED"/>
+                        <condition-list combine="or">
+                            <condition-expr field-name="statusId" operator="equals" value="CRQ_COMPLETED"/>
+                            <condition-expr field-name="statusId" operator="equals" value="CRQ_CANCELLED"/>
+                        </condition-list>
                     </condition-list>
                     <order-by field-name="custRequestDate"/>
                 </entity-condition>

Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml?rev=699207&r1=699206&r2=699207&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml Fri Sep 26 01:08:11 2008
@@ -179,6 +179,8 @@
     <form name="EditCustRequest" extends="EditCustRequest" extends-resource="component://projectmgr/widget/forms/RequestForms.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>
 
     <form name="ListInvoices" type="list" separate-columns="true" paginate-target="listInvoices" list-name="invoices"