svn commit: r759605 - in /ofbiz/trunk: applications/content/widget/fo
Locked
svn commit: r759605 - in /ofbiz/trunk: applications/content/widget/fo
 
|
Author: jleroux
Date: Sat Mar 28 22:06:23 2009 New Revision: 759605 URL: http://svn.apache.org/viewvc?rev=759605&view=rev Log: Fix some bad changes in previous commit (hyperlinks related) Modified: ofbiz/trunk/applications/content/widget/forum/ForumForms.xml ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml Modified: ofbiz/trunk/applications/content/widget/forum/ForumForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/ForumForms.xml?rev=759605&r1=759604&r2=759605&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/forum/ForumForms.xml (original) +++ ofbiz/trunk/applications/content/widget/forum/ForumForms.xml Sat Mar 28 22:06:23 2009 @@ -164,7 +164,7 @@ <parameter param-name="forumId" from-field="parameters.forumId"/> <parameter param-name="forumMessageIdTo" from-field="contentId"/> <parameter param-name="contentAssocTypeId" value="RESPONSE"/> - <hyperlink> + </hyperlink> </field> </form> Modified: ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml?rev=759605&r1=759604&r2=759605&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml Sat Mar 28 22:06:23 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="CreateProductCategoryAttribute" header-row-style="header-row" default-table-style="basic-table" type="single" target="createProductCategoryAttribute" title=""> <auto-fields-service service-name="createProductCategoryAttribute" default-field-type="edit"/> @@ -72,12 +72,12 @@ <field name="productCategoryId"><hidden/></field> <field name="contentId" title="${uiLabelMap.ProductContent}"> <display-entity entity-name="Content" description="${description}" also-hidden="true"> - <sub-hyperlink target="EditCategoryContentContent" description="${contentId"} link-style="buttontext"> - <parameter param-name="productCategoryId" from-field="productCategoryId"/> - <parameter param-name="contentId" from-field="contentId"/> - <parameter param-name="prodCatContentTypeId" from-field="prodCatContentTypeId"/> - <parameter param-name="fromDate" from-field="fromDate"/> - </sub-hyperlink> + <sub-hyperlink target="EditCategoryContentContent" description="${contentId}" link-style="buttontext"> + <parameter param-name="productCategoryId" from-field="productCategoryId"/> + <parameter param-name="contentId" from-field="contentId"/> + <parameter param-name="prodCatContentTypeId" from-field="prodCatContentTypeId"/> + <parameter param-name="fromDate" from-field="fromDate"/> + </sub-hyperlink> </display-entity> </field> <field name="prodCatContentTypeId" title="${uiLabelMap.ProductType}"> @@ -136,7 +136,7 @@ <field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field> </form> - + <!-- ProductCategoryLink Forms--> <form name="ListProductCategoryLinks" type="list" list-name="productCategoryLinks" target="updateProductCategoryLink" separate-columns="true" title="" odd-row-style="alternate-row" default-table-style="basic-table"> @@ -147,7 +147,7 @@ </entity-condition> </actions> <auto-fields-service service-name="updateProductCategoryLink"/> - + <field name="productCategoryId"><hidden/></field> <field name="linkSeqId"><display/></field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field> @@ -160,7 +160,7 @@ <field name="linkInfo"><ignored/></field> <field name="detailSubScreen"><ignored/></field> <field name="imageUrl"><ignored/></field> - <field name="imageTwoUrl"><ignored/></field> + <field name="imageTwoUrl"><ignored/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="deleteProductCategoryLink?productCategoryId=${productCategoryId}&linkSeqId=${linkSeqId}&fromDate=${fromDate}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> Modified: ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml?rev=759605&r1=759604&r2=759605&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/config/ConfigForms.xml Sat Mar 28 22:06:23 2009 @@ -235,14 +235,14 @@ <parameter param-name="configItemId" from-field="configItemId"/> <parameter param-name="configOptionId" from-field="configOptionId"/> <parameter param-name="productId" from-field="product.productId"/> - <hyperlink> + </hyperlink> </field> <field name="remove" widget-style="buttontext" > <hyperlink target="deleteProductConfigProduct" description="${uiLabelMap.CommonRemove}"> <parameter param-name="configItemId" from-field="configItemId"/> <parameter param-name="configOptionId" from-field="configOptionId"/> <parameter param-name="productId" from-field="product.productId"/> - <hyperlink> + </hyperlink> </field> </form> Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml?rev=759605&r1=759604&r2=759605&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml (original) +++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml Sat Mar 28 22:06:23 2009 @@ -49,9 +49,9 @@ </hyperlink> </field--> </form> - + <form name="EditWeekTimesheet" extends="EditWeekTimesheet" extends-resource="component://projectmgr/widget/forms/TimeSheetForms.xml"> - <alt-target use-when="!headerItem.equals("main")" target="updateTimesheetKey"/> + <alt-target use-when="!headerItem.equals("main")" target="updateTimesheetKey"/> <field name="updateButton"><submit/></field> </form> @@ -74,7 +74,7 @@ <field name="actualStartDate" title="${uiLabelMap.MyPageTaskActStartDate}"><display type="date"/></field> <field name="delete" title="${uiLabelMap.FormFieldTitle_deleteButton}"><submit button-type="text-link"/></field> </form> - + <form name="newEvent" type="single" target="createEvent"> <field name="donePage"><hidden/></field> <field name="workEffortTypeId"><hidden value="COMPANY_EVENT"/></field> @@ -94,26 +94,26 @@ <field name="myTimesheet" title="${uiLabelMap.MyPageTimeSheets}"><check/></field> <field name="updateButton"><submit/></field> </form> - + <form name="custPreferences" type="single" target="updateCustPreferences" default-map-name="preferences.userPrefMap"> <field name="userPrefGroupTypeId"><hidden value="MyPage"/></field> <field name="sendCustRequestEmail" title="${uiLabelMap.MyPageSendEmailToEveryCustomerRequestChange}"><check/></field> <field name="updateButton"><submit/></field> </form> - + <form name="ListPartyCommEvents" extends="ListCommEvents" extends-resource="component://party/webapp/partymgr/communication/CommForms.xml" type="list"> <row-actions> <set field="toComplete" value="${bsh:"COM_ROLE_READ".equals(roleStatusId)?"toComplete":""}"/> </row-actions> <field name="donePage"><hidden/></field> - <field name="roleTypeId"><display-entity entity-name="RoleType" description="${description}"/></field> + <field name="roleTypeId"><display-entity entity-name="RoleType" description="${description}"/></field> <field name="removeLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="RemoveCommunicationEventRole"> <parameter param-name="partyId" from-field="partyId"/> <parameter param-name="communicationEventId" from-field="communicationEventId"/> <parameter param-name="roleTypeId" from-field="roleTypeId"/> <parameter param-name="deleteCommEventIfLast" value="Y"/> - <parameter param-name="delContentDataResource value="Y"/> + <parameter param-name="delContentDataResource" value="Y"/> <parameter param-name="donePage" from-field="parameters.donePage"/> </hyperlink> </field> @@ -246,11 +246,11 @@ <entity-condition entity-name="CommunicationEvent" list="commEvents"> <condition-list combine="and"> <condition-expr field-name="statusId" operator="equals" value="COM_PENDING"/> - <condition-expr field-name="partyIdFrom" operator="equals" value="${partyId}"/> + <condition-expr field-name="partyIdFrom" operator="equals" value="${partyId}"/> </condition-list> <order-by field-name="-lastUpdatedStamp"/> </entity-condition> - </actions> + </actions> <field name="subject"> <hyperlink description="${subject}" target="EditCommunicationEvent"> <parameter param-name="communicationEventId" from-field="communicationEventId"/> @@ -268,7 +268,7 @@ <form name="MyPageNewEmail" type="single" target="createCommunicationEvent" default-map-name="communicationEvent"> <actions> - <set field="nowDate" value="${bsh:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy-MM-dd HH:mm:ss.S")}" type="String"/> + <set field="nowDate" value="${bsh:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy-MM-dd HH:mm:ss.S")}" type="String"/> <entity-condition entity-name="PartyContactWithPurpose" list="emailAddresses"> <condition-list combine="and"> <condition-expr field-name="partyId" value="${userLogin.partyId}"/> @@ -290,8 +290,8 @@ <set field="communicationEventId" from-field="parameters.communicationEventId"/> </actions> <alt-target use-when="communicationEventId!=null" target="updateCommunicationEvent"/> - <field name="donePage"><hidden/></field> - <field name="communicationEventId" use-when="communicationEventId!=null"><hidden/></field> + <field name="donePage"><hidden/></field> + <field name="communicationEventId" use-when="communicationEventId!=null"><hidden/></field> <field name="communicationEventTypeId"><hidden value="AUTO_EMAIL_COMM"/></field> <field name="statusId"><hidden value="COM_IN_PROGRESS"/></field> <field name="parentCommEventId" use-when="parentCommEventId != null"><hidden value="${parameters.parentCommEventId}"/></field> @@ -331,5 +331,5 @@ <form name="ListTaskInfo" extends="ListTaskInfo" extends-resource="component://projectmgr/widget/forms/ProjectForms.xml"> <field name="task"><display description="${workEffortName}"/></field> </form> - + </forms> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=759605&r1=759604&r2=759605&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Sat Mar 28 22:06:23 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 @@ -31,10 +31,10 @@ <drop-down allow-empty="true"> <entity-options entity-name="WorkEffort" description="${workEffortName}" key-field-name="workEffortId"> <entity-constraint name="workEffortTypeId" value="PROJECT_TEMPLATE"/> - </entity-options> + </entity-options> </drop-down> </field> - <field name="workEffortTypeId"><hidden value="PROJECT"/></field> + <field name="workEffortTypeId"><hidden value="PROJECT"/></field> <field name="projectId"><hidden/></field> <field name="workEffortId"><hidden value="${projectId}"/></field> <field name="projectName" parameter-name="workEffortName" title="${uiLabelMap.ProjectMgrProjectName}*"><text/></field> @@ -44,7 +44,7 @@ <field name="clientBillingPartyId"><lookup target-form-name="LookupPartyGroup"><sub-hyperlink target="viewprofile?partyId=${partyId}" description="${partyGroup.groupName}"/></lookup></field> <field name="organizationPartyId"> <drop-down no-current-selected-key="defaultOrganizationPartyId"> - <entity-options entity-name="PartyAcctgPrefAndGroup" description="${groupName}" key-field-name="partyId"/> + <entity-options entity-name="PartyAcctgPrefAndGroup" description="${groupName}" key-field-name="partyId"/> </drop-down> </field> <field name="priority" title="${uiLabelMap.CommonPriority}"><display/></field> @@ -60,7 +60,7 @@ <drop-down allow-empty="true"> <entity-options entity-name="WorkEffort" description="${workEffortName}" key-field-name="workEffortId"> <entity-constraint name="workEffortTypeId" value="PROJECT"/> - <entity-constraint name="workEffortId" operator="not-equals" env-name="projectId"/> + <entity-constraint name="workEffortId" operator="not-equals" env-name="projectId"/> </entity-options> </drop-down> </field> @@ -78,7 +78,7 @@ <drop-down> <entity-options entity-name="WorkEffort" description="${workEffortName}"> <entity-constraint name="workEffortTypeId" value="PROJECT"/> - <entity-constraint name="workEffortId" operator="not-equals" env-name="projectId"/> + <entity-constraint name="workEffortId" operator="not-equals" env-name="projectId"/> </entity-options> </drop-down> </field> @@ -148,7 +148,7 @@ <field name="plannedHours" map-name="resultProject.projectInfo" title="${uiLabelMap.ProjectMgrPlannedHours}"><display/></field> <field name="actualHours" map-name="resultProject.projectInfo" title="${uiLabelMap.ProjectMgrActualHours}"><display/></field> <field name="createdStamp" title="${uiLabelMap.FormFieldTitle_createdDate}"><display type="date"/></field> - </form> + </form> <form name="ListCurrentProjects" type="list" list-name="projects" paginate-target="main" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> @@ -190,7 +190,7 @@ <field name="plannedHours"><display/></field> <field name="actualHours"><display/></field> <field name="createdStamp"><display type="date"/></field> - <!--field name="removeButton"><submit/></field--><!-- TODO: difficult to clear the workEffortParentId field in the record have to find solution--> + <!--field name="removeButton"><submit/></field--><!-- TODO: difficult to clear the workEffortParentId field in the record have to find solution--> </form> <form name="ProjectInfo" type="single" default-map-name="project" paginate-target="FindProject" header-row-style="header-row" default-table-style="basic-table"> @@ -210,7 +210,7 @@ <field name="plannedHours"><display/></field> <field name="originalActualHours"><display/></field> <field name="actualHours"><display/></field> - </form> + </form> <form name="ListChildEfforts" target="updateProjectAndAssoc" title="" list-name="projects" type="list" separate-columns="true" paginate-target="FindProject" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <row-actions> @@ -225,7 +225,7 @@ <field name="workEffortAssocTypeId"><hidden/></field> <field name="workEffortIdTo" entry-name="workEffortId"><hidden/></field> <field name="workEffortName" position="1" title="${uiLabelMap.CommonName}*"><display/></field> - + <field name="currentStatusId"> <drop-down allow-empty="false" current-description="${currentStatus.description}"> <entity-options entity-name="StatusValidChangeToDetail" key-field-name="statusIdTo" description="${transitionName} (${description})"> @@ -247,12 +247,12 @@ <option key="8" description="${uiLabelMap.WorkEffortPriorityEight}"/> <option key="9" description="${uiLabelMap.WorkEffortPriorityNine}"/> </drop-down> - </field> + </field> <field name="actualStartDate" entry-name="workEffortToActualStartDate" title="${uiLabelMap.FormFieldTitle_actualStartDate}"><date-time/></field> <field name="actualCompletionDate" entry-name="workEffortToActualCompletionDate" title="${uiLabelMap.FormFieldTitle_actualCompletionDate}"><date-time/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> </form> - + <form name="EditProjectTasks" target="updateProjectTaskOrPhase" title="" list-name="tasks" type="list" separate-columns="true" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <row-actions> @@ -275,7 +275,7 @@ <entity-constraint name="workEffortTypeId" value="PHASE"/> <entity-constraint name="workEffortParentId" value="${projectId}"/> <entity-order-by field-name="workEffortName"/> - </entity-options> + </entity-options> </drop-down> </field> <field name="priority" title="${uiLabelMap.CommonPriority}"> @@ -290,11 +290,11 @@ <option key="8" description="${uiLabelMap.WorkEffortPriorityEight}"/> <option key="9" description="${uiLabelMap.WorkEffortPriorityNine}"/> </drop-down> - </field> + </field> <field name="estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><date-time type="date"/></field> <field name="estimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"><date-time type="date"/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> - </form> + </form> <form name="ListUnassignedTasks" target="updateTaskAndAssoc" title="" list-name="tasks" type="list" separate-columns="true" paginate-target="FindTask" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <row-actions> @@ -303,7 +303,7 @@ </entity-one> </row-actions> <field name="workEffortTypeId"><hidden/></field> - <field name="workEffortId"><hidden/></field> + <field name="workEffortId"><hidden/></field> <field name="workEffortAssocTypeId"><hidden/></field> <field name="workEffortIdTo" entry-name="workEffortId"><hidden/></field> <field name="workEffortName" position="1" title="${uiLabelMap.CommonName}*"><display/></field> @@ -332,7 +332,7 @@ </drop-down> </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> - </form> + </form> <form name="ListPhases" target="updateProjectPhase" title="" list-name="phases" type="list" separate-columns="true" paginate-target="FindPhase" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <field name="projectId"><hidden value="${parameters.projectId}"/></field> @@ -390,7 +390,7 @@ <parameter param-name="workEffortId" from-field="projectId"/> <parameter param-name="orderId" from-field="orderId"/> <parameter param-name="projectId" from-field="projectId"/> - <hyperlink> + </hyperlink> </field> </form> <form name="projectAssoOrder" type="list" list-name="listProjectAssoOrder" @@ -490,7 +490,7 @@ <order-by field-name="lastName"/> <order-by field-name="firstName"/> <order-by field-name="groupName"/> - </entity-condition> + </entity-condition> <entity-condition entity-name="WorkEffortPartyAssignView" filter-by-date="true" distinct="true" list="taskResources"> <condition-expr field-name="workEffortId" from-field="projectId"/> <select-field field-name="partyId"/> @@ -500,7 +500,7 @@ <order-by field-name="lastName"/> <order-by field-name="firstName"/> <order-by field-name="groupName"/> - </entity-condition> + </entity-condition> </actions> <alt-target use-when="workEffortId==projectId && parameters.get("partyId")==null" target="ListWorkEffortPartyAssigns"/><!-- this used for project partyId not yet selected --> <alt-target use-when="workEffortId!=projectId && parameters.get("partyId")==null" target="EditTaskPartyAssigns"/><!-- this used for tasks , partyId not yet selected--> @@ -510,12 +510,12 @@ <field name="workEffortId"><hidden value="${workEffortId}"/></field> <field name="partyId" use-when="workEffortId==projectId && parameters.get("partyId")!=null"><!-- project level --> <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}[${partyId}]"> - <sub-hyperlink target="ListWorkEffortPartyAssigns?projectId=${workEffortId}" description="${uiLabelMap.CommonChange}"/> + <sub-hyperlink target="ListWorkEffortPartyAssigns?projectId=${workEffortId}" description="${uiLabelMap.CommonChange}"/> </display-entity> </field> <field name="partyId" use-when="workEffortId!=projectId && parameters.get("partyId")!=null"><!-- task level --> <display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}[${partyId}]"> - <sub-hyperlink target="EditTaskPartyAssigns?workEffortId=${workEffortId}" description="${uiLabelMap.CommonChange}"/> + <sub-hyperlink target="EditTaskPartyAssigns?workEffortId=${workEffortId}" description="${uiLabelMap.CommonChange}"/> </display-entity> </field> <field name="partyId" use-when="workEffortId==projectId && parameters.get("partyId")==null" event="onChange" action="javascript:document.AddWorkEffortPartyAssign.submit();"><!-- project level --> @@ -583,7 +583,7 @@ <field name="workEffortId"><hidden value="${workEffortId}"/></field> <field name="priority" title="${uiLabelMap.CommonPriority}" widget-area-style="centered"> <display description="${priority}"/> - </field> + </field> <field name="estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}" widget-area-style="centered"><display type="date"/></field> <field name="estimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}" widget-area-style="centered"><display type="date"/></field> <field name="actualStartDate" title="${uiLabelMap.FormFieldTitle_actualStartDate}" widget-area-style="centered"><display type="date"/></field> @@ -627,7 +627,7 @@ </row-actions> <field entry-name="workEffortName" name="projectName" parameter-name="workEffortName" title="${uiLabelMap.CommonName}" widget-style="buttontext"> <hyperlink target="projectView?projectId=${workEffortId}" description="${workEffortName}[${workEffortId}]"/> - </field> + </field> <field name="currentStatusId" title="${uiLabelMap.CommonStatus}"> <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/> </field> @@ -646,11 +646,11 @@ <field name="statusId"><hidden value="PRTYASGN_ASSIGNED"/></field> <field name="workEffortId"><hidden value="${workEffortId}"/></field> <field name="partyId"><hidden/></field> - <field use-when="workEffortId==projectId" name="workEffortId" entry-name="test" title="${uiLabelMap.ProjectMgrProjectName}"><!-- project level --> + <field use-when="workEffortId==projectId" name="workEffortId" entry-name="test" title="${uiLabelMap.ProjectMgrProjectName}"><!-- project level --> <drop-down allow-empty="false"> <entity-options entity-name="WorkEffort" description="${workEffortName}" key-field-name="workEffortId"> <entity-constraint name="workEffortTypeId" value="PROJECT"/> - <entity-constraint name="workEffortId" operator="not-equals" env-name="projectId"/> + <entity-constraint name="workEffortId" operator="not-equals" env-name="projectId"/> </entity-options> </drop-down> </field> @@ -679,7 +679,7 @@ <entity-constraint name="partyId" env-name="parameters.partyId"/> <entity-constraint name="workEffortTypeId" value="TASK"/> <entity-constraint name="currentStatusId" operator="equals" value="PTS_CREATED"/> - </entity-options> + </entity-options> </drop-down> </field> <field entry-name="test" name="roleTypeId" title="${uiLabelMap.PartyRoleType}"> @@ -700,12 +700,12 @@ <field-map field-name="workEffortId" from-field="parameters.projectId"/> <field-map field-name="roleTypeId" value="INTERNAL_ORGANIZATIO"/> </entity-and> - <set field="partyIdFrom" value="${assignOrg[0].partyId}"/> + <set field="partyIdFrom" value="${assignOrg[0].partyId}"/> <entity-and entity-name="WorkEffortPartyAssignment" list="assignBilling" filter-by-date="true"> <field-map field-name="workEffortId" from-field="parameters.projectId"/> <field-map field-name="roleTypeId" value="CLIENT_BILLING"/> </entity-and> - <set field="partyId" value="${assignBilling[0].partyId}"/> + <set field="partyId" value="${assignBilling[0].partyId}"/> </actions> <field name="projectId"><hidden value="${parameters.projectId}"/></field> <field name="partyIdFrom" title="${uiLabelMap.WorkEffortTimeBillFromParty}"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}"/></field> @@ -770,11 +770,11 @@ <field-map field-name="dataResourceId" from-field="content.dataResourceId"/> </entity-one> </actions> - + <alt-target use-when="content!=null&&headerItem.equals("EditTaskContents")" target="updateTaskContent"/> <alt-target use-when="content==null&&headerItem.equals("EditProjectContents")" target="createProjectContent"/> <alt-target use-when="content==null&&headerItem.equals("EditTaskContents")" target="createTaskContent"/> - + <field name="workEffortId" map-name="parameters"><hidden/></field> <field name="projectId" map-name="parameters"><hidden/></field> <field use-when="content!=null" name="contentId" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> @@ -784,7 +784,7 @@ </drop-down> </field> <!-- note sure if these two are necessray, but they are kind of confusing in this context: - <field name="ownerContentId"><lookup target-form-name="LookupContent"/></field> + <field name="ownerContentId"><lookup target-form-name="LookupContent"/></field> <field name="dataResourceId"><lookup target-form-name="LookupDataResource"/></field> --> <field name="contentTypeId"> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml?rev=759605&r1=759604&r2=759605&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml Sat Mar 28 22:06:23 2009 @@ -41,7 +41,7 @@ <parameter param-name="communicationEventTypeId" value="EMAIL_COMMUNICATION"/> <parameter param-name="contactMechIdTo" from-field="contactMechId"/> <parameter param-name="contactMechTypeId" value="EMAIL_ADDRESS"/> - <hyperlink> + </hyperlink> </field> <field use-when="telResult.get("extension")!=null" name="telephone" title="${uiLabelMap.PartyPhoneNumber}"><display description="${telResult.countryCode} ${telResult.areaCode} ${telResult.contactNumber} Ext:${telResult.extension}"/></field> <field use-when="telResult.get("extension")==null" name="telephone" title="${uiLabelMap.PartyPhoneNumber}"><display description="${telResult.countryCode} ${telResult.areaCode} ${telResult.contactNumber}"/></field> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |