svn commit: r781552 - in /ofbiz/branches/release09.04: ./ applications/workeffort/config
Locked
 
|
Author: adrianc
Date: Wed Jun 3 21:18:40 2009 New Revision: 781552 URL: http://svn.apache.org/viewvc?rev=781552&view=rev Log: Applied fixes from trunk, rev 781201, 781534, 781549. Modified: ofbiz/branches/release09.04/ (props changed) ofbiz/branches/release09.04/applications/workeffort/config/WorkEffortUiLabels.xml ofbiz/branches/release09.04/applications/workeffort/widget/WorkEffortForms.xml ofbiz/branches/release09.04/applications/workeffort/widget/WorkEffortScreens.xml ofbiz/branches/release09.04/applications/workeffort/widget/WorkEffortTrees.xml ofbiz/branches/release09.04/specialpurpose/assetmaint/widget/AssetmaintScreens.xml Propchange: ofbiz/branches/release09.04/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jun 3 21:18:40 2009 @@ -1 +1 @@ -/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945 +/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549 Modified: ofbiz/branches/release09.04/applications/workeffort/config/WorkEffortUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/workeffort/config/WorkEffortUiLabels.xml?rev=781552&r1=781551&r2=781552&view=diff ============================================================================== --- ofbiz/branches/release09.04/applications/workeffort/config/WorkEffortUiLabels.xml (original) +++ ofbiz/branches/release09.04/applications/workeffort/config/WorkEffortUiLabels.xml Wed Jun 3 21:18:40 2009 @@ -1330,7 +1330,7 @@ <value xml:lang="zh">åå è </value> </property> <property key="WorkEffortBanner3"> - <value xml:lang="en">Enter existing CommunicationEvent Id below</value> + <value xml:lang="en">Enter existing Communication Event Id below</value> <value xml:lang="fr">Entrer la réf. existante d'événement de communication ci-dessous</value> <value xml:lang="it">Inserire qui sotto un evento comunicazioni</value> <value xml:lang="nl">Enter existing CommunicationEvent Id below</value> @@ -1339,7 +1339,7 @@ <value xml:lang="zh">å¨ä¸é¢è¾å ¥å·²åå¨çæ²éäºä»¶</value> </property> <property key="WorkEffortBanner4"> - <value xml:lang="en">OR add new CommunicationEvent data below to create new entity (leave CommunicationEvent Id empty)</value> + <value xml:lang="en">OR add new Communication Event data below to create new entity (leave Communication Event Id empty)</value> <value xml:lang="fr">OU Ajouter une nouvelle donnée d'événement de communication ci-dessous pour créer la nouvelle entité (Laisser la réf. d'évènement de communication vide)</value> <value xml:lang="it">O aggiungi un nuovo evento comunicazione qui sotto per creare una nuova entità (lasciare vuoto)</value> <value xml:lang="nl">OR add new CommunicationEvent data below to create new entity (leave CommunicationEvent Id empty)</value> Modified: ofbiz/branches/release09.04/applications/workeffort/widget/WorkEffortForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/workeffort/widget/WorkEffortForms.xml?rev=781552&r1=781551&r2=781552&view=diff ============================================================================== --- ofbiz/branches/release09.04/applications/workeffort/widget/WorkEffortForms.xml (original) +++ ofbiz/branches/release09.04/applications/workeffort/widget/WorkEffortForms.xml Wed Jun 3 21:18:40 2009 @@ -124,9 +124,9 @@ </field> - <field name="workEffortParentId"><lookup target-form-name="LookupWorkEffort"/></field> +<!-- <field name="workEffortParentId"><lookup target-form-name="LookupWorkEffort"/></field> --> <field name="facilityId"><lookup target-form-name="LookupFacility"/></field> - <field name="fixedAssetId"><lookup target-form-name="LookupFixedAsset"/></field> +<!-- <field name="fixedAssetId"><lookup target-form-name="LookupFixedAsset"/></field> --> <field name="moneyUomId" title="${uiLabelMap.CommonCurrency}"> <drop-down allow-empty="true"> <entity-options key-field-name="uomId" description="${abbreviation} - ${description}" entity-name="Uom"> Modified: ofbiz/branches/release09.04/applications/workeffort/widget/WorkEffortScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/workeffort/widget/WorkEffortScreens.xml?rev=781552&r1=781551&r2=781552&view=diff ============================================================================== --- ofbiz/branches/release09.04/applications/workeffort/widget/WorkEffortScreens.xml (original) +++ ofbiz/branches/release09.04/applications/workeffort/widget/WorkEffortScreens.xml Wed Jun 3 21:18:40 2009 @@ -103,7 +103,6 @@ <set field="titleProperty" value="PageTitleEditWorkEffort"/> <set field="tabButtonItem" value="WorkEffort"/> <set field="labelTitleProperty" value="PageTitleEditWorkEffort"/> - <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/workeffort/control/ListWorkEfforts"/> <set field="workEffortId" from-field="parameters.workEffortId"/> <set field="thisWorkEffortId" from-field="parameters.workEffortId"/> @@ -117,41 +116,18 @@ <if-empty field="workEffort"/> </condition> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleAddWorkEffort}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="EditWorkEffort" location="component://workeffort/widget/WorkEffortForms.xml"/> - </widgets> - </section> - </container> + <container style="h1"> + <label text="${uiLabelMap.PageTitleAddWorkEffort}"/> </container> + <include-form name="EditWorkEffort" location="component://workeffort/widget/WorkEffortForms.xml"/> </widgets> <fail-widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditWorkEffort}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <container> - <link text="${uiLabelMap.WorkEffortCreate}" target="EditWorkEffort" style="buttontext"> - <parameter param-name="DONE_PAGE" from-field="donePage"/> - </link> - </container> - <include-form name="EditWorkEffort" location="component://workeffort/widget/WorkEffortForms.xml"/> - </widgets> - </section> - </container> + <container style="button-bar"> + <link text="${uiLabelMap.WorkEffortCreate}" target="EditWorkEffort" style="buttontext"> + <parameter param-name="DONE_PAGE" from-field="donePage"/> + </link> </container> + <include-form name="EditWorkEffort" location="component://workeffort/widget/WorkEffortForms.xml"/> </fail-widgets> </section> <container style="screenlet"> @@ -229,92 +205,38 @@ </widgets> </section> </screen> + <screen name="ChildWorkEfforts"> <section> <actions> <set field="titleProperty" value="PageTitleTreeWorkEfforts"/> <set field="tabButtonItem" value="WorkEffortAssocs"/> <set field="labelTitleProperty" value="PageTitleListWorkEfforts"/> - <set field="trail" from-field="parameters.trail" default-value="${parameters.workEffortId}"/> - <set field="workEffortId" from-field="parameters.trail"/> + <set field="trail" from-field="requestParameters.trail"/> + <set field="workEffortId" from-field="parameters.workEffortId"/> + <set field="donePage" from-field="parameters.DONE_PAGE" default-value="ChildWorkEfforts?workEffortId=${parameters.workEffortId}"/> </actions> <widgets> <decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleTreeWorkEfforts}"/> + <section> + <widgets> + <container style="button-bar"> + <link target="AddWorkEffortAndAssoc" text="${uiLabelMap.WorkEffortAddChild}" style="buttontext"> + <parameter param-name="workEffortIdFrom" from-field="workEffortId"/> + </link> + <link target="AddWorkEffortAssoc" text="${uiLabelMap.WorkEffortAddExistingWorkEffortChild}" style="buttontext"> + <parameter param-name="workEffortIdFrom" from-field="workEffortId"/> + </link> </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <container> - <link text="${uiLabelMap.WorkEffortCreate}" target="EditWorkEffort" style="buttontext"> - <parameter param-name="DONE_PAGE" from-field="donePage"/> - </link> - </container> - <include-tree name="TreeWorkEffort" location="component://workeffort/widget/WorkEffortTrees.xml"/> - </widgets> - </section> - </container> - </container> + <include-tree name="TreeWorkEffort" location="component://workeffort/widget/WorkEffortTrees.xml"/> + </widgets> + </section> </decorator-section> </decorator-screen> </widgets> </section> </screen> - <screen name="WorkEffortTreeLine"> - <section> - <actions> - <set field="workEffortId" from-field="workEffortIdFrom" default-value="${workEffort.workEffortId}"/> - <entity-one entity-name="WorkEffort" value-field="workEffort"/> - <set field="donePage" from-field="parameters.DONE_PAGE" default-value="ChildWorkEfforts?workEffortId=${workEffort.workEffortId}"/> - </actions> - <widgets> - <label text=" ${workEffort.workEffortName} - ${workEffort.description}" style="tabletext"/> - <link target="EditWorkEffort" text="${workEffort.workEffortId}" style="buttontext"> - <parameter param-name="workEffortId" from-field="workEffort.workEffortId"/> - </link> - <link target="AddWorkEffortAndAssoc" text="${uiLabelMap.WorkEffortAddChild}" style="buttontext"> - <parameter param-name="workEffortIdFrom" from-field="workEffort.workEffortId"/> - </link> - <link target="AddWorkEffortAssoc" text="${uiLabelMap.WorkEffortAddExistingWorkEffortChild}" style="buttontext"> - <parameter param-name="workEffortIdFrom" from-field="workEffort.workEffortId"/> - </link> - <section> - <condition><not><if-empty field="workEffortAssoc"/></not></condition> - <widgets> - <link target="EditWorkEffortAssoc" text="${uiLabelMap.WorkEffortEditAssoc}" style="buttontext"> - <parameter param-name="workEffortIdFrom" from-field="workEffortAssoc.workEffortIdFrom"/> - <parameter param-name="workEffortIdTo" from-field="workEffortAssoc.workEffortIdTo"/> - <parameter param-name="workEffortAssocTypeId" from-field="workEffortAssoc.workEffortAssocTypeId"/> - <parameter param-name="fromDate" from-field="workEffortAssoc.fromDate"/> - <parameter param-name="DONE_PAGE" from-field="donePage"/> - </link> - <link target="EditWorkEffortAndAssoc" text="${uiLabelMap.WorkEffortEditAssocDetail}" style="buttontext"> - <parameter param-name="workEffortIdFrom" from-field="workEffortAssoc.workEffortIdFrom"/> - <parameter param-name="workEffortIdTo" from-field="workEffortAssoc.workEffortIdTo"/> - <parameter param-name="workEffortAssocTypeId" from-field="workEffortAssoc.workEffortAssocTypeId"/> - <parameter param-name="fromDate" from-field="workEffortAssoc.fromDate"/> - <parameter param-name="DONE_PAGE" from-field="donePage"/> - </link> - </widgets> - </section> - </widgets> - </section> - </screen> - <screen name="WorkEffortTreeLineForm"> - <section> - <actions> - <set field="listIt[]" from-field="workEffort" type="Object"/> - </actions> - <widgets> - <include-form name="WorkEffortTreeLine" location="component://workeffort/widget/WorkEffortForms.xml"/> - </widgets> - </section> - </screen> <screen name="AddWorkEffortAndAssoc"> <section> @@ -322,8 +244,7 @@ <set field="titleProperty" value="PageTitleEditWorkEffort"/> <set field="tabButtonItem" value="WorkEffort"/> <set field="labelTitleProperty" value="PageTitleEditWorkEffort"/> - - <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/workeffort/control/ListWorkEfforts"/> + <set field="donePage" from-field="parameters.DONE_PAGE" default-value="ChildWorkEfforts?workEffortId=${parameters.workEffortIdFrom}"/> <set field="workEffortIdFrom" from-field="parameters.workEffortIdFrom"/> <set field="workEffortAssocTypeId" value=""/> <set field="fromDate" from-field="nowTimestamp"/> @@ -331,32 +252,22 @@ <widgets> <decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleAddWorkEffort} ${uiLabelMap.WorkEffortAssociatedFromParentToChild}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="AddWorkEffortAndAssoc" location="component://workeffort/widget/WorkEffortForms.xml"/> - </widgets> - </section> - </container> + <container style="h1"> + <label text="${uiLabelMap.PageTitleAddWorkEffort} ${uiLabelMap.WorkEffortAssociatedFromParentToChild}"/> </container> + <include-form name="AddWorkEffortAndAssoc" location="component://workeffort/widget/WorkEffortForms.xml"/> </decorator-section> </decorator-screen> </widgets> </section> </screen> + <screen name="EditWorkEffortAndAssoc"> <section> <actions> <set field="titleProperty" value="PageTitleEditWorkEffort"/> <set field="tabButtonItem" value="WorkEffort"/> <set field="labelTitleProperty" value="PageTitleEditWorkEffort"/> - <set field="donePage" from-field="parameters.DONE_PAGE"/> <set field="workEffortIdTo" from-field="parameters.workEffortIdTo"/> <set field="workEffortIdFrom" from-field="parameters.workEffortIdFrom"/> @@ -370,20 +281,7 @@ <widgets> <decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditWorkEffort}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="EditWorkEffortAndAssoc" location="component://workeffort/widget/WorkEffortForms.xml"/> - </widgets> - </section> - </container> - </container> + <include-form name="EditWorkEffortAndAssoc" location="component://workeffort/widget/WorkEffortForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -403,20 +301,10 @@ <widgets> <decorator-screen name="CommonWorkEffortDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <label text="${uiLabelMap.PageTitleEditWorkEffortAssoc}"/> - </container> - </container> - <container style="screenlet-body"> - <section> - <widgets> - <include-form name="AddWorkEffortAssoc" location="component://workeffort/widget/WorkEffortForms.xml"/> - </widgets> - </section> - </container> + <container style="h1"> + <label text="${uiLabelMap.PageTitleEditWorkEffortAssoc}"/> </container> + <include-form name="AddWorkEffortAssoc" location="component://workeffort/widget/WorkEffortForms.xml"/> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/branches/release09.04/applications/workeffort/widget/WorkEffortTrees.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/workeffort/widget/WorkEffortTrees.xml?rev=781552&r1=781551&r2=781552&view=diff ============================================================================== --- ofbiz/branches/release09.04/applications/workeffort/widget/WorkEffortTrees.xml (original) +++ ofbiz/branches/release09.04/applications/workeffort/widget/WorkEffortTrees.xml Wed Jun 3 21:18:40 2009 @@ -20,22 +20,25 @@ <trees xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-tree.xsd"> - <tree name="TreeWorkEffort" root-node-name="node-root" entity-name="WorkEffort" - default-render-style="simple" default-wrap-style="treeWrapper"> - <node name="node-root" entity-name="WorkEffort" render-style="expand-collapse"> + <tree name="TreeWorkEffort" root-node-name="node-root" entity-name="WorkEffort" expand-collapse-request="ChildWorkEfforts?workEffortId=${workEffortId}" + default-render-style="expand-collapse" default-wrap-style="treeWrapper"> + <node name="node-root" entity-name="WorkEffort" > <entity-one entity-name="WorkEffort" value-field="workEffort"/> - <include-screen name="WorkEffortTreeLine" location="component://workeffort/widget/WorkEffortScreens.xml"/> <sub-node node-name="node-list"> <entity-condition entity-name="WorkEffortAssoc"> <condition-expr field-name="workEffortIdFrom" operator="equals" from-field="workEffortId"/> </entity-condition> </sub-node> </node> - <node name="node-list" entry-name="workEffortAssoc" entity-name="WorkEffortAssoc" join-field-name="workEffortIdTo" render-style="expand-collapse"> + <node name="node-list" entry-name="workEffortAssoc" entity-name="WorkEffortAssoc" join-field-name="workEffortIdTo"> <entity-one entity-name="WorkEffort" value-field="workEffort"> <field-map field-name="workEffortId" from-field="workEffortAssoc.workEffortIdTo"/> </entity-one> - <include-screen name="WorkEffortTreeLine" location="component://workeffort/widget/WorkEffortScreens.xml"/> + <link target="EditWorkEffortAndAssoc" text="${workEffort.workEffortName} - ${workEffort.description} [${workEffort.workEffortId}]"> + <parameter param-name="workEffortIdTo" from-field="workEffortAssoc.workEffortIdTo"/> + <parameter param-name="workEffortIdFrom" from-field="workEffortAssoc.workEffortIdFrom"/> + <parameter param-name="workEffortAssocTypeId" from-field="workEffortAssoc.workEffortAssocTypeId"/> + </link> <sub-node node-name="node-list"> <entity-condition entity-name="WorkEffortAssoc"> <condition-expr field-name="workEffortIdFrom" operator="equals" from-field="workEffortAssoc.workEffortIdTo"/> Modified: ofbiz/branches/release09.04/specialpurpose/assetmaint/widget/AssetmaintScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/assetmaint/widget/AssetmaintScreens.xml?rev=781552&r1=781551&r2=781552&view=diff ============================================================================== --- ofbiz/branches/release09.04/specialpurpose/assetmaint/widget/AssetmaintScreens.xml (original) +++ ofbiz/branches/release09.04/specialpurpose/assetmaint/widget/AssetmaintScreens.xml Wed Jun 3 21:18:40 2009 @@ -185,7 +185,7 @@ </widgets> <fail-widgets> <container style="button-bar"> - <link target="EditWorkEfforts" style="buttontext" text="${uiLabelMap.CommonNew"> + <link target="EditWorkEfforts" style="buttontext" text="${uiLabelMap.CommonNew}"> <parameter param-name="fixedAssetId" from-field="fixedAssetMaint.fixedAssetId"/> <parameter param-name="maintHistSeqId" from-field="fixedAssetMaint.maintHistSeqId"/> <parameter param-name="workEffortId"/> @@ -209,7 +209,7 @@ </widgets> <fail-widgets> <container style="button-bar"> - <link target="EditWorkEfforts" style="buttontext" text="${uiLabelMap.CommonNew"> + <link target="EditWorkEfforts" style="buttontext" text="${uiLabelMap.CommonNew}"> <parameter param-name="fixedAssetId" from-field="fixedAssetMaint.fixedAssetId"/> <parameter param-name="maintHistSeqId" from-field="fixedAssetMaint.maintHistSeqId"/> <parameter param-name="workEffortId"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |