Re: svn commit: r633827 [2/2] - /ofbiz/trunk/specialpurpose/pr
Locked
Re: svn commit: r633827 [2/2] - /ofbiz/trunk/specialpurpose/pr
 
|
The actual patch has only a single line modification. I am not sure but I
may be doing any thing wrong here while committing the code. The commit appears to have a lot of changes in the ProjectScreens.xml file, but the actual changes to trunk has also a single line modification. <screen name="NoteInfo"> <section> <actions> - <set field="workEffortId" from-field=" parameters.workEffortId"/> + <set field="workEffortId" from-field="projectId" /> <entity-and entity-name="WorkEffortNoteAndData" list-name="workEffortNoteandDetails"> <field-map field-name="workEffortId" env-name="workEffortId"/> <order-by field-name="-noteDateTime"/> Can any body point me if I am doing any thing wrong here. Vikas On Wed, Mar 5, 2008 at 5:15 PM, <[hidden email]> wrote: > > Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml > URL: > http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=633827&r1=633826&r2=633827&view=diff > > ============================================================================== > --- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml > (original) > +++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Wed > Mar 5 03:45:31 2008 > @@ -1,42 +1,42 @@ > -<?xml version="1.0" encoding="UTF-8"?> > -<!-- > -Licensed to the Apache Software Foundation (ASF) under one > -or more contributor license agreements. See the NOTICE file > -distributed with this work for additional information > -regarding copyright ownership. The ASF licenses this file > -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 > -KIND, either express or implied. See the License for the > -specific language governing permissions and limitations > -under the License. > ---> > - > -<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" > - xsi:noNamespaceSchemaLocation=" > http://ofbiz.apache.org/dtds/widget-screen.xsd"> > - <screen name="ListSubProjects"> > - <section> > - <actions> > - <set field="titleProperty" value="PageTitleFindProject"/> > - <set field="tabButtonItem" value="subprojects"/> > - <set field="labelTitleProperty" > value="ProjectMgrProjectName"/> > +<?xml version="1.0" encoding="UTF-8"?> > +<!-- > +Licensed to the Apache Software Foundation (ASF) under one > +or more contributor license agreements. See the NOTICE file > +distributed with this work for additional information > +regarding copyright ownership. The ASF licenses this file > +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 > +KIND, either express or implied. See the License for the > +specific language governing permissions and limitations > +under the License. > +--> > + > +<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" > + xsi:noNamespaceSchemaLocation=" > http://ofbiz.apache.org/dtds/widget-screen.xsd"> > + <screen name="ListSubProjects"> > + <section> > + <actions> > + <set field="titleProperty" value="PageTitleFindProject"/> > + <set field="tabButtonItem" value="subprojects"/> > + <set field="labelTitleProperty" > value="ProjectMgrProjectName"/> > <set field="projectId" from-field="parameters.projectId" > default-value="${parameters.workEffortId}"/> > - <set field="viewIndex" from-field="parameters.VIEW_INDEX" > type="Integer"/> > - <set field="viewSize" from-field="parameters.VIEW_SIZE" > type="Integer" default-value="20"/> > - <entity-and entity-name="WorkEffort" > list-name="projects"> > - <field-map field-name="workEffortTypeId" > value="PROJECT"/> > - <field-map field-name="workEffortParentId" > env-name="projectId"/> > - </entity-and> > - </actions> > - <widgets> > - <decorator-screen name="CommonProjectDecorator" > location="${parameters.mainDecoratorLocation}"> > - <decorator-section name="body"> > + <set field="viewIndex" from-field="parameters.VIEW_INDEX" > type="Integer"/> > + <set field="viewSize" from-field="parameters.VIEW_SIZE" > type="Integer" default-value="20"/> > + <entity-and entity-name="WorkEffort" > list-name="projects"> > + <field-map field-name="workEffortTypeId" > value="PROJECT"/> > + <field-map field-name="workEffortParentId" > env-name="projectId"/> > + </entity-and> > + </actions> > + <widgets> > + <decorator-screen name="CommonProjectDecorator" > location="${parameters.mainDecoratorLocation}"> > + <decorator-section name="body"> > <container style="screenlet"> > <container style="screenlet-title-bar"> > <container style="h3"> > @@ -65,11 +65,11 @@ > </section> > </container> > </container> > - </decorator-section> > - </decorator-screen> > - </widgets> > - </section> > - </screen> > + </decorator-section> > + </decorator-screen> > + </widgets> > + </section> > + </screen> > <screen name="FindResource"> > <section> > <actions> > @@ -81,8 +81,8 @@ > <order-by field-name="lastName"/> > <order-by field-name="groupName"/> > </entity-and> > - <set field="viewIndex" from-field="parameters.VIEW_INDEX" > type="Integer"/> > - <set field="viewSize" from-field="parameters.VIEW_SIZE" > type="Integer" default-value="10"/> > + <set field="viewIndex" from-field="parameters.VIEW_INDEX" > type="Integer"/> > + <set field="viewSize" from-field="parameters.VIEW_SIZE" > type="Integer" default-value="10"/> > </actions> > <widgets> > <decorator-screen name="CommonResourceDecorator" > location="${parameters.mainDecoratorLocation}"> > @@ -124,45 +124,45 @@ > </widgets> > </section> > </screen> > - <screen name="FindProject"> > - <section> > - <actions> > - <set field="titleProperty" value="PageTitleFindProject"/> > - <set field="labelTitleProperty" > value="ProjectMgrProjectName"/> > - <set field="workEffortId" from-field=" > parameters.projectId"/> > - <set field="viewIndex" from-field="parameters.VIEW_INDEX" > type="Integer"/> > - <set field="viewSize" from-field="parameters.VIEW_SIZE" > type="Integer" default-value="10"/> > - </actions> > - <widgets> > - <decorator-screen name="CommonProjectDecorator" > location="${parameters.mainDecoratorLocation}"> > - <decorator-section name="body"> > - <include-menu name="ProjectSubTabBar" > location="component://projectmgr/widget/Menus.xml"/> > - <screenlet name="findProject" collapsible="true" > title="${uiLabelMap.PageTitleFindProject}"> > - <include-form name="FindProject" > location="component://projectmgr/widget/forms/ProjectForms.xml"/> > - </screenlet> > - <screenlet title="${ > uiLabelMap.PageTitleFindProjectResults}" > navigation-form-name="ListProjects"> > + <screen name="FindProject"> > + <section> > + <actions> > + <set field="titleProperty" value="PageTitleFindProject"/> > + <set field="labelTitleProperty" > value="ProjectMgrProjectName"/> > + <set field="workEffortId" from-field=" > parameters.projectId"/> > + <set field="viewIndex" from-field="parameters.VIEW_INDEX" > type="Integer"/> > + <set field="viewSize" from-field="parameters.VIEW_SIZE" > type="Integer" default-value="10"/> > + </actions> > + <widgets> > + <decorator-screen name="CommonProjectDecorator" > location="${parameters.mainDecoratorLocation}"> > + <decorator-section name="body"> > + <include-menu name="ProjectSubTabBar" > location="component://projectmgr/widget/Menus.xml"/> > + <screenlet name="findProject" collapsible="true" > title="${uiLabelMap.PageTitleFindProject}"> > + <include-form name="FindProject" > location="component://projectmgr/widget/forms/ProjectForms.xml"/> > + </screenlet> > + <screenlet title="${ > uiLabelMap.PageTitleFindProjectResults}" > navigation-form-name="ListProjects"> > <include-form name="ListProjects" > location="component://projectmgr/widget/forms/ProjectForms.xml"/> > </screenlet> > - </decorator-section> > - </decorator-screen> > - </widgets> > - </section> > - </screen> > - <screen name="EditProject"> > - <section> > - <actions> > - <set field="titleProperty" value="PageTitleEditProject"/> > - <set field="tabButtonItem" value="editproject"/> > - <set field="labelTitleProperty" > value="PageTitleEditProject"/> > - <set field="projectId" from-field="parameters.projectId" > default-value="${parameters.workEffortId}"/> > - <service service-name="getProject" > result-map-name="result"> > - <field-map field-name="projectId" > env-name="projectId"/> > - </service> > - <set field="project" from-field="result.projectInfo"/> > - </actions> > - <widgets> > - <decorator-screen name="CommonProjectDecorator" > location="${parameters.mainDecoratorLocation}"> > - <decorator-section name="body"> > + </decorator-section> > + </decorator-screen> > + </widgets> > + </section> > + </screen> > + <screen name="EditProject"> > + <section> > + <actions> > + <set field="titleProperty" value="PageTitleEditProject"/> > + <set field="tabButtonItem" value="editproject"/> > + <set field="labelTitleProperty" > value="PageTitleEditProject"/> > + <set field="projectId" from-field="parameters.projectId" > default-value="${parameters.workEffortId}"/> > + <service service-name="getProject" > result-map-name="result"> > + <field-map field-name="projectId" > env-name="projectId"/> > + </service> > + <set field="project" from-field="result.projectInfo"/> > + </actions> > + <widgets> > + <decorator-screen name="CommonProjectDecorator" > location="${parameters.mainDecoratorLocation}"> > + <decorator-section name="body"> > <container style="screenlet"> > <container style="screenlet-title-bar"> > <container style="h3"> > @@ -176,25 +176,25 @@ > </widgets> > </section> > </container> > - </container> > - </decorator-section> > - </decorator-screen> > - </widgets> > - </section> > - </screen> > - <screen name="projectBilling"> > - <section> > - <actions> > - <set field="titleProperty" > value="PageTitleProjectBilling"/> > - <set field="tabButtonItem" value="billing"/> > - <set field="labelTitleProperty" > value="PageTitleProjectBilling"/> > - <set field="projectId" from-field="parameters.projectId" > default-value="${parameters.workEffortId}"/> > - <set field="viewIndex" from-field="parameters.VIEW_INDEX" > type="Integer"/> > - <set field="viewSize" from-field="parameters.VIEW_SIZE" > type="Integer" default-value="20"/> > - </actions> > - <widgets> > - <decorator-screen name="CommonProjectDecorator" > location="${parameters.mainDecoratorLocation}"> > - <decorator-section name="body"> > + </container> > + </decorator-section> > + </decorator-screen> > + </widgets> > + </section> > + </screen> > + <screen name="projectBilling"> > + <section> > + <actions> > + <set field="titleProperty" > value="PageTitleProjectBilling"/> > + <set field="tabButtonItem" value="billing"/> > + <set field="labelTitleProperty" > value="PageTitleProjectBilling"/> > + <set field="projectId" from-field="parameters.projectId" > default-value="${parameters.workEffortId}"/> > + <set field="viewIndex" from-field="parameters.VIEW_INDEX" > type="Integer"/> > + <set field="viewSize" from-field="parameters.VIEW_SIZE" > type="Integer" default-value="20"/> > + </actions> > + <widgets> > + <decorator-screen name="CommonProjectDecorator" > location="${parameters.mainDecoratorLocation}"> > + <decorator-section name="body"> > <container style="screenlet"> > <container style="screenlet-title-bar"> > <container style="h3"> > @@ -208,26 +208,26 @@ > </widgets> > </section> > </container> > - </container> > - </decorator-section> > - </decorator-screen> > - </widgets> > - </section> > - </screen> > - > - <screen name="ChildWorkEfforts"> > - <section> > - <actions> > - <set field="titleProperty" > value="PageTitleListWorkEfforts"/> > - <set field="tabButtonItem" value="treeDetails"/> > - <set field="labelTitleProperty" > value="PageTitleListWorkEfforts"/> > - <set field="trail" from-field="parameters.trail" > default-value="${parameters.workEffortId}"/> > + </container> > + </decorator-section> > + </decorator-screen> > + </widgets> > + </section> > + </screen> > + > + <screen name="ChildWorkEfforts"> > + <section> > + <actions> > + <set field="titleProperty" > value="PageTitleListWorkEfforts"/> > + <set field="tabButtonItem" value="treeDetails"/> > + <set field="labelTitleProperty" > value="PageTitleListWorkEfforts"/> > + <set field="trail" from-field="parameters.trail" > default-value="${parameters.workEffortId}"/> > <set field="workEffortId" from-field=" > parameters.WorkEffortId" default-value="parameters.workEffortIdForm"/> > - <set field="workEffortIdFrom" from-field=" > parameters.workEffortId"/> > - </actions> > - <widgets> > - <decorator-screen name="CommonProjectDecorator" > location="${parameters.mainDecoratorLocation}"> > - <decorator-section name="body"> > + <set field="workEffortIdFrom" from-field=" > parameters.workEffortId"/> > + </actions> > + <widgets> > + <decorator-screen name="CommonProjectDecorator" > location="${parameters.mainDecoratorLocation}"> > + <decorator-section name="body"> > <container style="screenlet"> > <container style="screenlet-title-bar"> > <container style="h3"> > @@ -242,98 +242,98 @@ > </widgets> > </section> > </container> > - </container> > - </decorator-section> > - </decorator-screen> > - </widgets> > - </section> > - </screen> > - > - <screen name="WorkEffortTreeLine"> > - <section> > - <actions> > - <set field="workEffortId" from-field="workEffortIdFrom" > default-value="${workEffort.workEffortId}"/> > - <set field="tabButtonItem" value="treeDetails"/> > - <entity-one entity-name="WorkEffort" > value-name="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?workEffortId=${ > workEffort.workEffortId}" text="${workEffort.workEffortId}" > style="buttontext"/> > - <link target="AddProjectAndAssoc?workEffortIdFrom=${ > workEffort.workEffortId}" text="${uiLabelMap.WorkEffortAddChild}" > style="buttontext"></link> > - <link target="AddProjectAndAssoc?workEffortIdFrom=${ > workEffort.workEffortId}" text="${ > uiLabelMap.WorkEffortAddExistingWorkEffortChild}" > style="buttontext"></link> > - <section> > - <condition><not><if-empty > field-name="workEffortAssoc"/></not></condition> > - <widgets> > - <link > target="EditProjectAndAssoc?workEffortIdFrom=${ > workEffortAssoc.workEffortIdFrom}&workEffortIdTo=${ > workEffortAssoc.workEffortIdTo}&workEffortAssocTypeId=${ > workEffortAssoc.workEffortAssocTypeId}&fromDate=${ > workEffortAssoc.fromDate}&DONE_PAGE=${donePage}" text="Edit Assoc" > style="buttontext"></link> > - <link > target="EditProjectAndAssoc?workEffortIdFrom=${ > workEffortAssoc.workEffortIdFrom}&workEffortIdTo=${ > workEffortAssoc.workEffortIdTo}&workEffortAssocTypeId=${ > workEffortAssoc.workEffortAssocTypeId}&fromDate=${ > workEffortAssoc.fromDate}&DONE_PAGE=${donePage}" text="Edit Assoc > Detail" style="buttontext"></link> > - </widgets> > - </section> > - </widgets> > - </section> > - </screen> > - <screen name="EditProjectAndAssoc"> > - <section> > - <actions> > - <set field="titleProperty" value="PageTitleEditProject"/> > - <set field="labelTitleProperty" > value="PageTitleEditProject"/> > - <set field="tabButtonItem" value="treeDetails"/> > - <set field="donePage" from-field="parameters.DONE_PAGE"/> > - <set field="workEffortId" from-field=" > parameters.workEffortIdTo"/> > - <set field="workEffortIdTo" from-field=" > parameters.workEffortIdTo"/> > - <set field="workEffortIdFrom" from-field=" > parameters.workEffortIdFrom"/> > - <set field="fromDate" from-field="parameters.fromDate"/> > - <entity-one entity-name="WorkEffort" > value-name="project"/> > - <entity-one entity-name="WorkEffortAssoc" > value-name="workEffortAssoc"/> > - </actions> > - <widgets> > - <decorator-screen name="CommonProjectDecorator" > location="${parameters.mainDecoratorLocation}"> > - <decorator-section name="body"> > - <container><label > style="h1">${uiLabelMap.${titleProperty}}</label></container> > - <platform-specific> > - <html><html-template > location="component://projectmgr/webapp/projectmgr/project/editprojectandassoc.ftl"/></html> > - </platform-specific> > - </decorator-section> > - </decorator-screen> > - </widgets> > - </section> > - </screen> > - > - <screen name="EditProjectTasks"> > - <section> > - <actions> > - <set field="titleProperty" value="PageTitleEditTask"/> > - <set field="tabButtonItem" value="tasks"/> > - <set field="labelTitleProperty" > value="PageTitleFindTask"/> > - <set field="projectId" from-field="parameters.projectId > "/> > + </container> > + </decorator-section> > + </decorator-screen> > + </widgets> > + </section> > + </screen> > + > + <screen name="WorkEffortTreeLine"> > + <section> > + <actions> > + <set field="workEffortId" from-field="workEffortIdFrom" > default-value="${workEffort.workEffortId}"/> > + <set field="tabButtonItem" value="treeDetails"/> > + <entity-one entity-name="WorkEffort" > value-name="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?workEffortId=${ > workEffort.workEffortId}" text="${workEffort.workEffortId}" > style="buttontext"/> > + <link target="AddProjectAndAssoc?workEffortIdFrom=${ > workEffort.workEffortId}" text="${uiLabelMap.WorkEffortAddChild}" > style="buttontext"></link> > + <link target="AddProjectAndAssoc?workEffortIdFrom=${ > workEffort.workEffortId}" text="${ > uiLabelMap.WorkEffortAddExistingWorkEffortChild}" > style="buttontext"></link> > + <section> > + <condition><not><if-empty > field-name="workEffortAssoc"/></not></condition> > + <widgets> > + <link > target="EditProjectAndAssoc?workEffortIdFrom=${ > workEffortAssoc.workEffortIdFrom}&workEffortIdTo=${ > workEffortAssoc.workEffortIdTo}&workEffortAssocTypeId=${ > workEffortAssoc.workEffortAssocTypeId}&fromDate=${ > workEffortAssoc.fromDate}&DONE_PAGE=${donePage}" text="Edit Assoc" > style="buttontext"></link> > + <link > target="EditProjectAndAssoc?workEffortIdFrom=${ > workEffortAssoc.workEffortIdFrom}&workEffortIdTo=${ > workEffortAssoc.workEffortIdTo}&workEffortAssocTypeId=${ > workEffortAssoc.workEffortAssocTypeId}&fromDate=${ > workEffortAssoc.fromDate}&DONE_PAGE=${donePage}" text="Edit Assoc > Detail" style="buttontext"></link> > + </widgets> > + </section> > + </widgets> > + </section> > + </screen> > + <screen name="EditProjectAndAssoc"> > + <section> > + <actions> > + <set field="titleProperty" value="PageTitleEditProject"/> > + <set field="labelTitleProperty" > value="PageTitleEditProject"/> > + <set field="tabButtonItem" value="treeDetails"/> > + <set field="donePage" from-field="parameters.DONE_PAGE"/> > + <set field="workEffortId" from-field=" > parameters.workEffortIdTo"/> > + <set field="workEffortIdTo" from-field=" > parameters.workEffortIdTo"/> > + <set field="workEffortIdFrom" from-field=" > parameters.workEffortIdFrom"/> > + <set field="fromDate" from-field="parameters.fromDate"/> > + <entity-one entity-name="WorkEffort" > value-name="project"/> > + <entity-one entity-name="WorkEffortAssoc" > value-name="workEffortAssoc"/> > + </actions> > + <widgets> > + <decorator-screen name="CommonProjectDecorator" > location="${parameters.mainDecoratorLocation}"> > + <decorator-section name="body"> > + <container><label > style="h1">${uiLabelMap.${titleProperty}}</label></container> > + <platform-specific> > + <html><html-template > location="component://projectmgr/webapp/projectmgr/project/editprojectandassoc.ftl"/></html> > + </platform-specific> > + </decorator-section> > + </decorator-screen> > + </widgets> > + </section> > + </screen> > + > + <screen name="EditProjectTasks"> > + <section> > + <actions> > + <set field="titleProperty" value="PageTitleEditTask"/> > + <set field="tabButtonItem" value="tasks"/> > + <set field="labelTitleProperty" > value="PageTitleFindTask"/> > + <set field="projectId" from-field="parameters.projectId > "/> > <entity-and entity-name="ProjectAndPhaseAndTask" > list-name="tasks"> > <field-map field-name="projectId" env-name=" > parameters.projectId"/> > <order-by field-name="phaseName"/> > <order-by field-name="workEffortName"/> > </entity-and> > - <entity-and entity-name="WorkEffort" list-name="phases"> > - <field-map field-name="workEffortParentId" env-name=" > parameters.projectId"/> > - <field-map field-name="workEffortTypeId" > value="PHASE"/> > - </entity-and> > - <set field="viewIndex" from-field="parameters.VIEW_INDEX" > type="Integer"/> > - <set field="viewSize" from-field="parameters.VIEW_SIZE" > type="Integer" default-value="10"/> > - </actions> > - <widgets> > - <decorator-screen name="CommonProjectDecorator" > location="${parameters.mainDecoratorLocation}"> > + <entity-and entity-name="WorkEffort" list-name="phases"> > + <field-map field-name="workEffortParentId" env-name=" > parameters.projectId"/> > + <field-map field-name="workEffortTypeId" > value="PHASE"/> > + </entity-and> > + <set field="viewIndex" from-field="parameters.VIEW_INDEX" > type="Integer"/> > + <set field="viewSize" from-field="parameters.VIEW_SIZE" > type="Integer" default-value="10"/> > + </actions> > + <widgets> > + <decorator-screen name="CommonProjectDecorator" > location="${parameters.mainDecoratorLocation}"> > <decorator-section name="body"> > <container style="screenlet"> > <container style="screenlet-title-bar"> > <container style="h3"> > <label > text="${uiLabelMap.${titleProperty}}"/> > </container> > - </container> > + </container> > <container style="screenlet-body"> > <section> > <widgets> > <include-form > name="EditProjectTasks" > location="component://projectmgr/widget/forms/ProjectForms.xml"/> > </widgets> > </section> > - </container> > + </container> > </container> > <container style="lefthalf"> > <container style="screenlet"> > @@ -343,17 +343,17 @@ > </container> > </container> > <container style="screenlet-body"> > - <section> > - <condition> > - <if-empty > field-name="phases"/> > - </condition> > - <widgets> > - <label style="h3" text="${ > uiLabelMap.ProjectMgrNoPhasesYet}"/> > - </widgets> > - <fail-widgets> > - <include-form > name="AddProjectTask" > location="component://projectmgr/widget/forms/TaskForms.xml"/> > - </fail-widgets> > - </section> > + <section> > + <condition> > + <if-empty > field-name="phases"/> > + </condition> > + <widgets> > + <label style="h3" text="${ > uiLabelMap.ProjectMgrNoPhasesYet}"/> > + </widgets> > + <fail-widgets> > + <include-form > name="AddProjectTask" > location="component://projectmgr/widget/forms/TaskForms.xml"/> > + </fail-widgets> > + </section> > </container> > </container> > </container> > @@ -373,88 +373,88 @@ > </container> > </container> > </container> > - </decorator-section> > - </decorator-screen> > - </widgets> > - </section> > - </screen> > - <screen name="EditTask"> > - <section> > - <actions> > - <set field="titleProperty" value="PageTitleEditTask"/> > - <set field="tabButtonItem" value="edittask"/> > - <set field="labelTitleProperty" > value="ProjectMgrTaskName"/> > - <set field="donePage" from-field="parameters.DONE_PAGE" > default-value="/workeffort/control/FindTasks"/> > - <set field="projectId" from-field="parameters.projectId > "/> > - <set field="workEffortId" from-field=" > parameters.workEffortId"/> > - <set field="workEffortAssocTypeId" from-field=" > parameters.workEffortAssocTypeId"/> > - <set field="workEffortTypeId" from-field=" > parameters.workEffortTypeId"/> > - <entity-one entity-name="WorkEffort" value-name="task"/> > - </actions> > - <widgets> > - <decorator-screen name="CommonTaskDecorator" location="${ > parameters.mainDecoratorLocation}"> > - <decorator-section name="body"> > - <section> > - <condition> > - <if-empty > field-name="workEffortAssocTypeId"/> > - </condition> > - <!-- Add a new Task --> > - <widgets> > - <label style="h1">${ > uiLabelMap.PageTitleEditTask}</label> > - <platform-specific> > - <html><html-template > location="component://projectmgr/webapp/projectmgr/project/edittask.ftl"/></html> > - </platform-specific> > - </widgets> > - <fail-widgets> > - <section> > - <condition> > - <not> > - <if-empty > field-name="workEffortIdFrom"/> > - </not> > - </condition> > - <!-- Edit an existing Task --> > - <widgets> > - <platform-specific> > - <html><html-template > location="component://projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl"/></html> > - </platform-specific> > - </widgets> > - <!-- Edit an existing SubTask --> > - <fail-widgets> > - <container><link text="${ > uiLabelMap.CommonGoBack}" target="FindTask?workEffortId=${ > task.workEffortParentId}&workEffortTypeId=TASK" > style="buttontext"/></container> > - <label style="h1">${ > uiLabelMap.ProjectMgrSubTaskName}: ${task.workEffortName}</label> > - <container><label style="h1">${ > uiLabelMap.PageTitleEditSubTask}</label></container> > - <platform-specific> > - <html><html-template > location="component://projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl"/></html> > - </platform-specific> > - </fail-widgets> > - </section> > - </fail-widgets> > - </section> > - </decorator-section> > - </decorator-screen> > - </widgets> > - </section> > - </screen> > - > - <screen name="FindPhase"> > - <section> > - <actions> > - <set field="titleProperty" value="PageTitleEditPhase"/> > - <set field="tabButtonItem" value="phases"/> > - <set field="labelTitleProperty" > value="PageTitleFindPhase"/> > + </decorator-section> > + </decorator-screen> > + </widgets> > + </section> > + </screen> > + <screen name="EditTask"> > + <section> > + <actions> > + <set field="titleProperty" value="PageTitleEditTask"/> > + <set field="tabButtonItem" value="edittask"/> > + <set field="labelTitleProperty" > value="ProjectMgrTaskName"/> > + <set field="donePage" from-field="parameters.DONE_PAGE" > default-value="/workeffort/control/FindTasks"/> > + <set field="projectId" from-field="parameters.projectId > "/> > + <set field="workEffortId" from-field=" > parameters.workEffortId"/> > + <set field="workEffortAssocTypeId" from-field=" > parameters.workEffortAssocTypeId"/> > + <set field="workEffortTypeId" from-field=" > parameters.workEffortTypeId"/> > + <entity-one entity-name="WorkEffort" value-name="task"/> > + </actions> > + <widgets> > + <decorator-screen name="CommonTaskDecorator" location="${ > parameters.mainDecoratorLocation}"> > + <decorator-section name="body"> > + <section> > + <condition> > + <if-empty > field-name="workEffortAssocTypeId"/> > + </condition> > + <!-- Add a new Task --> > + <widgets> > + <label style="h1">${ > uiLabelMap.PageTitleEditTask}</label> > + <platform-specific> > + <html><html-template > location="component://projectmgr/webapp/projectmgr/project/edittask.ftl"/></html> > + </platform-specific> > + </widgets> > + <fail-widgets> > + <section> > + <condition> > + <not> > + <if-empty > field-name="workEffortIdFrom"/> > + </not> > + </condition> > + <!-- Edit an existing Task --> > + <widgets> > + <platform-specific> > + <html><html-template > location="component://projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl"/></html> > + </platform-specific> > + </widgets> > + <!-- Edit an existing SubTask --> > + <fail-widgets> > + <container><link text="${ > uiLabelMap.CommonGoBack}" target="FindTask?workEffortId=${ > task.workEffortParentId}&workEffortTypeId=TASK" > style="buttontext"/></container> > + <label style="h1">${ > uiLabelMap.ProjectMgrSubTaskName}: ${task.workEffortName}</label> > + <container><label style="h1">${ > uiLabelMap.PageTitleEditSubTask}</label></container> > + <platform-specific> > + <html><html-template > location="component://projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl"/></html> > + </platform-specific> > + </fail-widgets> > + </section> > + </fail-widgets> > + </section> > + </decorator-section> > + </decorator-screen> > + </widgets> > + </section> > + </screen> > + > + <screen name="FindPhase"> > + <section> > + <actions> > + <set field="titleProperty" value="PageTitleEditPhase"/> > + <set field="tabButtonItem" value="phases"/> > + <set field="labelTitleProperty" > value="PageTitleFindPhase"/> > <set field="projectId" from-field="parameters.projectId"/> > <service service-name="getProjectPhaseList" > result-map-name="result"> > <field-map field-name="projectId" > env-name="projectId"/> > </service> > - <set field="phases" from-field="result.phaseList"/> > - <set field="viewIndex" from-field="parameters.VIEW_INDEX" > type="Integer"/> > - <set field="viewSize" from-field="parameters.VIEW_SIZE" > type="Integer" default-value="10"/> > - </actions> > - <widgets> > - <decorator-screen name="CommonProjectDecorator" > location="${parameters.mainDecoratorLocation}"> > - <decorator-section name="body"> > - <section> > - <widgets> > + <set field="phases" from-field="result.phaseList"/> > + <set field="viewIndex" from-field="parameters.VIEW_INDEX" > type="Integer"/> > + <set field="viewSize" from-field="parameters.VIEW_SIZE" > type="Integer" default-value="10"/> > + </actions> > + <widgets> > + <decorator-screen name="CommonProjectDecorator" > location="${parameters.mainDecoratorLocation}"> > + <decorator-section name="body"> > + <section> > + <widgets> > <container style="screenlet"> > <container > style="screenlet-title-bar"> > <container style="h3"> > @@ -483,28 +483,28 @@ > </section> > </container> > </container> > - </widgets> > - </section> > - </decorator-section> > - </decorator-screen> > - </widgets> > - </section> > - </screen> > - <screen name="EditProjectParties"> > - <section> > - <actions> > - <set field="titleProperty" > value="PageTitleListWorkEffortPartyAssigns"/> > - <set field="tabButtonItem" value="parties"/> > - <set field="labelTitleProperty" > value="PageTitleListWorkEffortPartyAssigns"/> > + </widgets> > + </section> > + </decorator-section> > + </decorator-screen> > + </widgets> > + </section> > + </screen> > + <screen name="EditProjectParties"> > + <section> > + <actions> > + <set field="titleProperty" > value="PageTitleListWorkEffortPartyAssigns"/> > + <set field="tabButtonItem" value="parties"/> > + <set field="labelTitleProperty" > value="PageTitleListWorkEffortPartyAssigns"/> > <set field="workEffortId" from-field="parameters.projectId" > default-value="parameters.workEffortId"/> > <set field="projectId" from-field="workEffortId"/> > - <entity-one entity-name="WorkEffortPartyAssignment" > value-name="workEffortPartyAssignment"/> > - <set field="viewIndex" from-field="parameters.VIEW_INDEX" > type="Integer"/> > - <set field="viewSize" from-field="parameters.VIEW_SIZE" > type="Integer" default-value="10"/> > - </actions> > - <widgets> > - <decorator-screen name="CommonProjectDecorator" > location="${parameters.mainDecoratorLocation}"> > - <decorator-section name="body"> > + <entity-one entity-name="WorkEffortPartyAssignment" > value-name="workEffortPartyAssignment"/> > + <set field="viewIndex" from-field="parameters.VIEW_INDEX" > type="Integer"/> > + <set field="viewSize" from-field="parameters.VIEW_SIZE" > type="Integer" default-value="10"/> > + </actions> > + <widgets> > + <decorator-screen name="CommonProjectDecorator" > location="${parameters.mainDecoratorLocation}"> > + <decorator-section name="body"> > <container style="screenlet"> > <container style="screenlet-title-bar"> > <container style="h3"> > @@ -533,29 +533,29 @@ > </section> > </container> > </container> > - </decorator-section> > - </decorator-screen> > - </widgets> > - </section> > - </screen> > - <screen name="EditProjectSkills"> > - <section> > - <actions> > - <set field="titleProperty" value="PageTitleEditSkill"/> > - <set field="tabButtonItem" value="projectskills"/> > - <set field="labelTitleProperty" > value="PageTitleEditSkill"/> > - <set field="workEffortId" from-field=" > parameters.projectId" default-value="${parameters.workEffortId}"/> > - <entity-and entity-name="WorkEffortSkillStandard" > list-name="workEffortSkillStandardList"> > - <field-map field-name="workEffortId"/> > - </entity-and> > - <set field="viewIndex" from-field="parameters.VIEW_INDEX" > type="Integer"/> > - <set field="viewSize" from-field="parameters.VIEW_SIZE" > type="Integer" default-value="10"/> > - </actions> > - <widgets> > - <decorator-screen name="CommonProjectDecorator" > location="${parameters.mainDecoratorLocation}"> > - <decorator-section name="body"> > - <section> > - <widgets> > + </decorator-section> > + </decorator-screen> > + </widgets> > + </section> > + </screen> > + <screen name="EditProjectSkills"> > + <section> > + <actions> > + <set field="titleProperty" value="PageTitleEditSkill"/> > + <set field="tabButtonItem" value="projectskills"/> > + <set field="labelTitleProperty" > value="PageTitleEditSkill"/> > + <set field="workEffortId" from-field=" > parameters.projectId" default-value="${parameters.workEffortId}"/> > + <entity-and entity-name="WorkEffortSkillStandard" > list-name="workEffortSkillStandardList"> > + <field-map field-name="workEffortId"/> > + </entity-and> > + <set field="viewIndex" from-field="parameters.VIEW_INDEX" > type="Integer"/> > + <set field="viewSize" from-field="parameters.VIEW_SIZE" > type="Integer" default-value="10"/> > + </actions> > + <widgets> > + <decorator-screen name="CommonProjectDecorator" > location="${parameters.mainDecoratorLocation}"> > + <decorator-section name="body"> > + <section> > + <widgets> > <container style="screenlet"> > <container > style="screenlet-title-bar"> > <container style="h3"> > @@ -569,56 +569,56 @@ > </widgets> > </section> > </container> > - </container> > - <platform-specific> > - <html><html-template > location="component://projectmgr/webapp/projectmgr/project/editProjectskills.ftl"/></html> > - </platform-specific> > - </widgets> > - </section> > - </decorator-section> > - </decorator-screen> > - </widgets> > - </section> > - </screen> > - <screen name="EditPartySkills"> > - <section> > - <actions> > - <set field="tabButtonItem" value="parties"/> > - <set field="partyId" from-field="parameters.partyId"/> > - <set field="workEffortId" from-field=" > parameters.projectId"/> > - </actions> > - <widgets> > - <decorator-screen name="CommonProjectDecorator" > location="${parameters.mainDecoratorLocation}"> > - <decorator-section name="body"> > - <container> > - <link target="EditPartySkill" text="${ > uiLabelMap.HumanResNewPartySkill}" style="buttontext"/> > - </container> > - <container style="boxoutside"> > - <container style="screenlet-header"> > - <label style="boxhead">${ > uiLabelMap.HumanResEditPartySkill}</label> > - </container> > - <include-form name="ListPartySkills" > location="component://humanres/widget/forms/PartyAbilityForms.xml"/> > - <include-form name="EditPartySkill" > location="component://humanres/widget/forms/PartyAbilityForms.xml"/> > - </container> > - </decorator-section> > - </decorator-screen> > - </widgets> > - </section> > - </screen> > - <screen name="EditProjectNotes"> > - <section> > - <actions> > - <set field="titleProperty" > value="PageTitleListProjectNotes"/> > - <set field="tabButtonItem" value="notes"/> > - <set field="labelTitleProperty" > value="PageTitleListProjectNotes"/> > + </container> > + <platform-specific> > + <html><html-template > location="component://projectmgr/webapp/projectmgr/project/editProjectskills.ftl"/></html> > + </platform-specific> > + </widgets> > + </section> > + </decorator-section> > + </decorator-screen> > + </widgets> > + </section> > + </screen> > + <screen name="EditPartySkills"> > + <section> > + <actions> > + <set field="tabButtonItem" value="parties"/> > + <set field="partyId" from-field="parameters.partyId"/> > + <set field="workEffortId" from-field=" > parameters.projectId"/> > + </actions> > + <widgets> > + <decorator-screen name="CommonProjectDecorator" > location="${parameters.mainDecoratorLocation}"> > + <decorator-section name="body"> > + <container> > + <link target="EditPartySkill" text="${ > uiLabelMap.HumanResNewPartySkill}" style="buttontext"/> > + </container> > + <container style="boxoutside"> > + <container style="screenlet-header"> > + <label style="boxhead">${ > uiLabelMap.HumanResEditPartySkill}</label> > + </container> > + <include-form name="ListPartySkills" > location="component://humanres/widget/forms/PartyAbilityForms.xml"/> > + <include-form name="EditPartySkill" > location="component://humanres/widget/forms/PartyAbilityForms.xml"/> > + </container> > + </decorator-section> > + </decorator-screen> > + </widgets> > + </section> > + </screen> > + <screen name="EditProjectNotes"> > + <section> > + <actions> > + <set field="titleProperty" > value="PageTitleListProjectNotes"/> > + <set field="tabButtonItem" value="notes"/> > + <set field="labelTitleProperty" > value="PageTitleListProjectNotes"/> > <set field="workEffortId" from-field="parameters.projectId" > default-value="${parameters.workEffortId}"/> > <set field="parameters.projectId" > from-field="workEffortId"/> > - <set field="viewIndex" from-field="parameters.VIEW_INDEX" > type="Integer"/> > - <set field="viewSize" from-field="parameters.VIEW_SIZE" > type="Integer" default-value="10"/> > - </actions> > - <widgets> > - <decorator-screen name="CommonProjectDecorator" > location="${parameters.mainDecoratorLocation}"> > - <decorator-section name="body"> > + <set field="viewIndex" from-field="parameters.VIEW_INDEX" > type="Integer"/> > + <set field="viewSize" from-field="parameters.VIEW_SIZE" > type="Integer" default-value="10"/> > + </actions> > + <widgets> > + <decorator-screen name="CommonProjectDecorator" > location="${parameters.mainDecoratorLocation}"> > + <decorator-section name="body"> > <container style="screenlet"> > <container style="screenlet-title-bar"> > <container style="h3"> > @@ -646,28 +646,28 @@ > </widgets> > </section> > </container> > - </container> > - </decorator-section> > - </decorator-screen> > - </widgets> > - </section> > - </screen> > - <screen name="ProjectView"> > - <section> > - <actions> > - <set field="titleProperty" > value="ProjectMgrProjectSummary"/> > - <set field="tabButtonItem" value="projectView"/> > - <set field="projectId" from-field="parameters.projectId" > default-value="parameters.workEffortId"/> > + </container> > + </decorator-section> > + </decorator-screen> > + </widgets> > + </section> > + </screen> > + <screen name="ProjectView"> > + <section> > + <actions> > + <set field="titleProperty" > value="ProjectMgrProjectSummary"/> > + <set field="tabButtonItem" value="projectView"/> > + <set field="projectId" from-field="parameters.projectId" > default-value="parameters.workEffortId"/> > <service service-name="getProject" > result-map-name="result"> > <field-map field-name="projectId" > env-name="projectId"/> > </service> > <set field="project" from-field="result.projectInfo"/> > - </actions> > - <widgets> > - <decorator-screen name="CommonProjectDecorator" > location="${parameters.mainDecoratorLocation}"> > - <decorator-section name="body"> > - <section> > - <widgets> > + </actions> > + <widgets> > + <decorator-screen name="CommonProjectDecorator" > location="${parameters.mainDecoratorLocation}"> > + <decorator-section name="body"> > + <section> > + <widgets> > <container style="lefthalf"> > <container style="screenlet"> > <container > style="screenlet-title-bar"> > @@ -686,18 +686,18 @@ > <include-screen name="PhasesInfo"/> > <include-screen name="TasksInfo"/> > </container> > - <container style="righthalf"> > + <container style="righthalf"> > <include-screen > name="SubProjectsInfo"/> > <include-screen name="PartiesInfo"/> > - <include-screen name="NoteInfo"/> > + <include-screen name="NoteInfo"/> > </container> > - </widgets> > - </section> > - </decorator-section> > - </decorator-screen> > - </widgets> > - </section> > - </screen> > + </widgets> > + </section> > + </decorator-section> > + </decorator-screen> > + </widgets> > + </section> > + </screen> > <screen name="ganttChart"> > <section> > <actions> > @@ -731,15 +731,15 @@ > </widgets> > </section> > </screen> > - <screen name="SubProjectsInfo"> > - <section> > - <actions> > - <set field="projectId" from-field="parameters.projectId" > default-value="${parameters.workEffortId}"/> > - <set field="viewIndex" from-field="parameters.VIEW_INDEX" > type="Integer"/> > - <set field="viewSize" from-field="parameters.VIEW_SIZE" > type="Integer" default-value="20"/> > - <set field="parameters.workEffortParentId" > from-field="projectId" /> > - </actions> > - <widgets> > + <screen name="SubProjectsInfo"> > + <section> > + <actions> > + <set field="projectId" from-field="parameters.projectId" > default-value="${parameters.workEffortId}"/> > + <set field="viewIndex" from-field="parameters.VIEW_INDEX" > type="Integer"/> > + <set field="viewSize" from-field="parameters.VIEW_SIZE" > type="Integer" default-value="20"/> > + <set field="parameters.workEffortParentId" > from-field="projectId" /> > + </actions> > + <widgets> > <container style="screenlet"> > <container style="screenlet-title-bar"> > <container style="h3"> > @@ -753,10 +753,10 @@ > </widgets> > </section> > </container> > - </container> > - </widgets> > - </section> > - </screen> > + </container> > + </widgets> > + </section> > + </screen> > <screen name="PhasesInfo"> > <section> > <actions> > @@ -764,8 +764,8 @@ > <field-map field-name="projectId" > env-name="projectId"/> > </service> > <set field="phases" from-field="result.phaseList"/> > - <set field="viewIndex" from-field="parameters.VIEW_INDEX" > type="Integer"/> > - <set field="viewSize" from-field="parameters.VIEW_SIZE" > type="Integer" default-value="10"/> > + <set field="viewIndex" from-field="parameters.VIEW_INDEX" > type="Integer"/> > + <set field="viewSize" from-field="parameters.VIEW_SIZE" > type="Integer" default-value="10"/> > </actions> > <widgets> > <container style="screenlet"> > @@ -792,8 +792,8 @@ > <field-map field-name="projectId" > env-name="projectId"/> > </service> > <set field="tasks" from-field="result.taskList"/> > - <set field="viewIndex" from-field="parameters.VIEW_INDEX" > type="Integer"/> > - <set field="viewSize" from-field="parameters.VIEW_SIZE" > type="Integer" default-value="10"/> > + <set field="viewIndex" from-field="parameters.VIEW_INDEX" > type="Integer"/> > + <set field="viewSize" from-field="parameters.VIEW_SIZE" > type="Integer" default-value="10"/> > </actions> > <widgets> > <container style="screenlet"> > @@ -813,17 +813,17 @@ > </widgets> > </section> > </screen> > - <screen name="PartiesInfo"> > - <section> > + <screen name="PartiesInfo"> > + <section> > <actions> > <service service-name="getProjectsByParties" > result-map-name="result"> > <field-map field-name="projectId" > env-name="projectId"/> > </service> > <set field="parties" from-field="result.projectParties"/> > - <set field="viewIndex" from-field="parameters.VIEW_INDEX" > type="Integer"/> > - <set field="viewSize" from-field="parameters.VIEW_SIZE" > type="Integer" default-value="10"/> > - </actions> > - <widgets> > + <set field="viewIndex" from-field="parameters.VIEW_INDEX" > type="Integer"/> > + <set field="viewSize" from-field="parameters.VIEW_SIZE" > type="Integer" default-value="10"/> > + </actions> > + <widgets> > <container style="screenlet"> > <container style="screenlet-title-bar"> > <container style="h3"> > @@ -837,93 +837,93 @@ > </widgets> > </section> > </container> > - </container> > - </widgets> > - </section> > - </screen> > - <screen name="NoteInfo"> > - <section> > - <actions> > - <set field="workEffortId" from-field=" > parameters.workEffortId"/> > - <entity-and entity-name="WorkEffortNoteAndData" > list-name="workEffortNoteandDetails"> > - <field-map field-name="workEffortId" > env-name="workEffortId"/> > - <order-by field-name="-noteDateTime"/> > - </entity-and> > - </actions> > - <widgets> > - <platform-specific> > - <html><html-template > location="component://projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl"/></html> > - </platform-specific> > - </widgets> > - </section> > - </screen> > - <screen name="viewprofile"> > - <section> > - <actions> > - <set field="tabButtonItem" value="ResourcesProfile"/> > - <set field="titleProperty" value="PartyProfile"/> > - <set field="headerItem" value="find"/> > - <set field="labelTitleProperty" > value="PartyTaxAuthInfos"/> > - <set field="layoutSettings.javaScripts[]" > value="/images/prototypejs/prototype.js" global="true"/> > - <set field="layoutSettings.javaScripts[]" > value="/images/prototypejs/control.progress_bar.js" global="true"/> > - <set field="layoutSettings.styleSheets[]" > value="/images/prototypejs/progress_bar.css" global="true"/> > - <set field="layoutSettings.javaScripts[]" > value="/partymgr/js/PartyProfileContent.js" global="true"/> > - <script > location="component://party/webapp/partymgr/WEB-INF/actions/party/viewprofile.bsh"/> > - <script > location="component://party/webapp/partymgr/WEB-INF/actions/party/getUserLoginPrimaryEmail.bsh"/> > - </actions> > - <widgets> > - <decorator-screen name="CommonListResourceDecorator" > location="${parameters.mainDecoratorLocation}"> > - <decorator-section name="body"> > - <section> > - <condition> > - <not><if-empty field-name="party"/></not> > - </condition> > - <widgets> > - <include-screen name="Party" > location="component://party/widget/partymgr/ProfileScreens.xml"/> > - <include-screen name="Contact" > location="component://party/widget/partymgr/ProfileScreens.xml"/> > - <include-screen name="UserLogin" > location="component://party/widget/partymgr/ProfileScreens.xml"/> > - <include-screen name="Visits" > location="component://party/widget/partymgr/ProfileScreens.xml"/> > - <include-screen name="Notes" > location="component://party/widget/partymgr/ProfileScreens.xml"/> > - </widgets> > - <fail-widgets> > - <container> > - <label style="h3">${ > uiLabelMap.PartyNoPartyFoundWithPartyId}: ${parameters.partyId}</label> > - </container> > - </fail-widgets> > - </section> > - </decorator-section> > - </decorator-screen> > - </widgets> > - </section> > - </screen> > - > - <screen name="listResourcesProject"> > - <section> > - <actions> > - <set field="tabButtonItem" value="listResourcesProject"/> > - <set field="titleProperty" > value="PageTitleListProjectByParty"/> > - <set field="workEffortId" from-field=" > parameters.projectId"/> > - <entity-and entity-name="WorkEffortAndPartyAssign" > list-name="parties"> > - <field-map field-name="workEffortTypeId" > value="PROJECT"/> > - <field-map field-name="partyId" env-name=" > parameters.partyId"/> > - <order-by field-name="workEffortId"/> > - </entity-and> > - <set field="projectId" from-field="parameters.projectId" > default-value="${parameters.workEffortId}"/> > - <service service-name="getProject" > result-map-name="result"> > - <field-map field-name="projectId" > env-name="projectId"/> > - </service> > - <set field="project" from-field="result.projectInfo"/> > - <set field="workEffortId" from-field=" > parameters.projectId" default-value="parameters.workEffortId"/> > - <set field="projectId" from-field="workEffortId"/> > - <entity-one entity-name="WorkEffortPartyAssignment" > value-name="workEffortPartyAssignment"/> > - <set field="viewIndex" from-field="parameters.VIEW_INDEX" > type="Integer"/> > - <set field="viewSize" from-field="parameters.VIEW_SIZE" > type="Integer" default-value="10"/> > - </actions> > - <widgets> > - <decorator-screen name="CommonListResourceDecorator" > location="${parameters.mainDecoratorLocation}"> > - <decorator-section name="body"> > - <section> > - <widgets> > + </container> > + </widgets> > + </section> > + </screen> > + <screen name="NoteInfo"> > + <section> > + <actions> > + <set field="workEffortId" from-field="projectId"/> > + <entity-and entity-name="WorkEffortNoteAndData" > list-name="workEffortNoteandDetails"> > + <field-map field-name="workEffortId" > env-name="workEffortId"/> > + <order-by field-name="-noteDateTime"/> > + </entity-and> > + </actions> > + <widgets> > + <platform-specific> > + <html><html-template > location="component://projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl"/></html> > + </platform-specific> > + </widgets> > + </section> > + </screen> > + <screen name="viewprofile"> > + <section> > + <actions> > + <set field="tabButtonItem" value="ResourcesProfile"/> > + <set field="titleProperty" value="PartyProfile"/> > + <set field="headerItem" value="find"/> > + <set field="labelTitleProperty" > value="PartyTaxAuthInfos"/> > + <set field="layoutSettings.javaScripts[]" > value="/images/prototypejs/prototype.js" global="true"/> > + <set field="layoutSettings.javaScripts[]" > value="/images/prototypejs/control.progress_bar.js" global="true"/> > + <set field="layoutSettings.styleSheets[]" > value="/images/prototypejs/progress_bar.css" global="true"/> > + <set field="layoutSettings.javaScripts[]" > value="/partymgr/js/PartyProfileContent.js" global="true"/> > + <script > location="component://party/webapp/partymgr/WEB-INF/actions/party/viewprofile.bsh"/> > + <script > location="component://party/webapp/partymgr/WEB-INF/actions/party/getUserLoginPrimaryEmail.bsh"/> > + </actions> > + <widgets> > + <decorator-screen name="CommonListResourceDecorator" > location="${parameters.mainDecoratorLocation}"> > + <decorator-section name="body"> > + <section> > + <condition> > + <not><if-empty field-name="party"/></not> > + </condition> > + <widgets> > + <include-screen name="Party" > location="component://party/widget/partymgr/ProfileScreens.xml"/> > + <include-screen name="Contact" > location="component://party/widget/partymgr/ProfileScreens.xml"/> > + <include-screen name="UserLogin" > location="component://party/widget/partymgr/ProfileScreens.xml"/> > + <include-screen name="Visits" > location="component://party/widget/partymgr/ProfileScreens.xml"/> > + <include-screen name="Notes" > location="component://party/widget/partymgr/ProfileScreens.xml"/> > + </widgets> > + <fail-widgets> > + <container> > + <label style="h3">${ > uiLabelMap.PartyNoPartyFoundWithPartyId}: ${parameters.partyId}</label> > + </container> > + </fail-widgets> > + </section> > + </decorator-section> > + </decorator-screen> > + </widgets> > + </section> > + </screen> > + > + <screen name="listResourcesProject"> > + <section> > + <actions> > + <set field="tabButtonItem" value="listResourcesProject"/> > + <set field="titleProperty" > value="PageTitleListProjectByParty"/> > + <set field="workEffortId" from-field=" > parameters.projectId"/> > + <entity-and entity-name="WorkEffortAndPartyAssign" > list-name="parties"> > + <field-map field-name="workEffortTypeId" > value="PROJECT"/> > + <field-map field-name="partyId" env-name=" > parameters.partyId"/> > + <order-by field-name="workEffortId"/> > + </entity-and> > + <set field="projectId" from-field="parameters.projectId" > default-value="${parameters.workEffortId}"/> > + <service service-name="getProject" > result-map-name="result"> > + <field-map field-name="projectId" > env-name="projectId"/> > + </service> > + <set field="project" from-field="result.projectInfo"/> > + <set field="workEffortId" from-field=" > parameters.projectId" default-value="parameters.workEffortId"/> > + <set field="projectId" from-field="workEffortId"/> > + <entity-one entity-name="WorkEffortPartyAssignment" > value-name="workEffortPartyAssignment"/> > + <set field="viewIndex" from-field="parameters.VIEW_INDEX" > type="Integer"/> > + <set field="viewSize" from-field="parameters.VIEW_SIZE" > type="Integer" default-value="10"/> > + </actions> > + <widgets> > + <decorator-screen name="CommonListResourceDecorator" > location="${parameters.mainDecoratorLocation}"> > + <decorator-section name="body"> > + <section> > + <widgets> > <container style="screenlet"> > <container > style="screenlet-title-bar"> > <container style="h3"> > @@ -951,37 +951,37 @@ > </widgets> > </section> > </container> > - </container> > - </widgets> > - </section> > - </decorator-section> > - </decorator-screen> > - </widgets> > - </section> > - </screen> > - > - <screen name="listResourcesTask"> > - <section> > - <actions> > - <set field="tabButtonItem" value="listResourcesTask"/> > - <set field="titleProperty" > value="PageTitleListTaskByParty"/> > - <set field="workEffortId" from-field=" > parameters.projectId"/> > - <entity-and entity-name="WorkEffortAndPartyAssign" > list-name="tasks"> > - <field-map field-name="partyId" env-name=" > parameters.partyId"/> > - <field-map field-name="workEffortTypeId" > value="TASK"/> > - <field-map field-name="statusId" > value="PRTYASGN_ASSIGNED"/> > - <order-by field-name="workEffortId"/> > - </entity-and> > - <set field="projectId" from-field="parameters.projectId" > default-value="${parameters.workEffortId}"/> > - <set field="partyId" from-field="parameters.partyId"/> > - <set field="viewIndex" from-field="parameters.VIEW_INDEX" > type="Integer"/> > - <set field="viewSize" from-field="parameters.VIEW_SIZE" > type="Integer" default-value="10"/> > - </actions> > - <widgets> > - <decorator-screen name="CommonListResourceDecorator" > location="${parameters.mainDecoratorLocation}"> > - <decorator-section name="body"> > - <section> > - <widgets> > + </container> > + </widgets> > + </section> > + </decorator-section> > + </decorator-screen> > + </widgets> > + </section> > + </screen> > + > + <screen name="listResourcesTask"> > + <section> > + <actions> > + <set field="tabButtonItem" value="listResourcesTask"/> > + <set field="titleProperty" > value="PageTitleListTaskByParty"/> > + <set field="workEffortId" from-field=" > parameters.projectId"/> > + <entity-and entity-name="WorkEffortAndPartyAssign" > list-name="tasks"> > + <field-map field-name="partyId" env-name=" > parameters.partyId"/> > + <field-map field-name="workEffortTypeId" > value="TASK"/> > + <field-map field-name="statusId" > value="PRTYASGN_ASSIGNED"/> > + <order-by field-name="workEffortId"/> > + </entity-and> > + <set field="projectId" from-field="parameters.projectId" > default-value="${parameters.workEffortId}"/> > + <set field="partyId" from-field="parameters.partyId"/> > + <set field="viewIndex" from-field="parameters.VIEW_INDEX" > type="Integer"/> > + <set field="viewSize" from-field="parameters.VIEW_SIZE" > type="Integer" default-value="10"/> > + </actions> > + <widgets> > + <decorator-screen name="CommonListResourceDecorator" > location="${parameters.mainDecoratorLocation}"> > + <decorator-section name="body"> > + <section> > + <widgets> > <container style="screenlet"> > <container > style="screenlet-title-bar"> > <container style="h3"> > @@ -1009,192 +1009,192 @@ > </widgets> > </section> > </container> > - </container> > - </widgets> > - </section> > - </decorator-section> > - </decorator-screen> > - </widgets> > - </section> > - </screen> > - > - <screen name="EditPerson"> > - <section> > - <actions> > - <set field="titleProperty" > value="PageTitleEditPersonalInformation"/> > - <set field="tabButtonItem" value="viewprofile"/> > - <set field="headerItem" value="create"/> > - <set field="labelTitleProperty" > value="PageTitleEditPersonalInformation"/> > - > - <set field="donePage" from-field="parameters.DONE_PAGE" > default-value="viewprofile"/> > - <set field="partyId" from-field="parameters.partyId"/> > - <entity-one entity-name="PartyAndPerson" > value-name="person"/> > - </actions> > - <widgets> > - <decorator-screen name="CommonListResourceDecorator" > location="${parameters.mainDecoratorLocation}"> > - <decorator-section name="body"> > - <include-form name="EditPerson" > location="component://party/webapp/partymgr/party/PartyForms.xml"/> > - </decorator-section> > - </decorator-screen> > - </widgets> > - </section> > - </screen> > - > - <screen name="AddPartyNote"> > - <section> > - <actions> > - <set field="titleProperty" > value="PageTitleNewPartyNote"/> > - <set field="tabButtonItem" value="viewprofile"/> > - <set field="labelTitleProperty" > value="PageTitleNewPartyNote"/> > - > - <set field="donePage" from-field="parameters.DONE_PAGE" > default-value="viewprofile"/> > - <set field="partyId" from-field="parameters.partyId"/> > - </actions> > - <widgets> > - <decorator-screen name="CommonListResourceDecorator" > location="${parameters.mainDecoratorLocation}"> > - <decorator-section name="body"> > - <container><label text="${ > uiLabelMap.PageTitleNewPartyNote}" style="h2"/></container> > - <include-form name="AddPartyNote" > location="component://party/webapp/partymgr/party/PartyForms.xml"/> > - </decorator-section> > - </decorator-screen> > - </widgets> > - </section> > - </screen> > - > - <screen name="editcontactmech"> > - <section> > - <actions> > - <set field="titleProperty" > value="PageTitleEditContactMech"/> > - <set field="headerItem" value="find"/> > - <set field="tabButtonItem" value="editcontactmech"/> > - > - <set field="labelTitleProperty" > value="PageTitleEditContactMech"/> > - > - <script > location="component://party/webapp/partymgr/WEB-INF/actions/HasPartyPermissions.bsh"/> > - <script > location="component://party/webapp/partymgr/WEB-INF/actions/party/editcontactmech.bsh"/> > - </actions> > - <widgets> > - <decorator-screen name="CommonListResourceDecorator" > location="${parameters.mainDecoratorLocation}"> > - <decorator-section name="body"> > - <section> > - <condition> > - <or> > - <if-compare > field-name="hasViewPermission" operator="equals" value="true" > type="Boolean"/> > - <if-compare > field-name="hasPcmCreatePermission" operator="equals" value="true" > type="Boolean"/> > - <if-compare > field-name="hasPcmUpdatePermission" operator="equals" value="true" > type="Boolean"/> > - <not><if-empty field-name=" > mechMap.partyContactMech"/></not> > - </or> > - </condition> > - <widgets> > - <platform-specific> > - <html><html-template > location="component://party/webapp/partymgr/party/editcontactmech.ftl"/></html> > - </platform-specific> > - </widgets> > - <fail-widgets> > - <container> > - <label style="h3">${ > uiLabelMap.PartyMsgContactNotBelongToYou}</label> > - </container> > - <container> > - <link target="authview/${donePage}" > text="[${uiLabelMap.CommonBack}]" style="smallSubmit"/> > - </container> > - </fail-widgets> > - </section> > - </decorator-section> > - </decorator-screen> > - </widgets> > - </section> > - </screen> > - > - <screen name="EditCommunicationEvent"> > - <section> > - <actions> > - <set field="titleProperty" > value="PageTitleEditCommunication"/> > - <set field="tabButtonItem" value="PartyCommEvents"/> > - <set field="subTabButtonItem" > value="CommunicationEvent"/> > - <set field="entityName" value="CommunicationEvent"/> > - > - <set field="communicationEventId" from-field=" > parameters.communicationEventId"/> > - <set field="parentCommEventId" from-field=" > parameters.parentCommEventId"/> > - > - <set field="partyId" from-field="parameters.partyId"/> > - <set field="partyIdFrom" from-field=" > parameters.partyIdFrom" default-value="${userLogin.partyId}"/> > - <set field="partyIdTo" from-field="parameters.partyIdTo > "/> > - <set field="contactMechIdFrom" from-field=" > parameters.contactMechIdFrom"/> > - <set field="contactMechIdTo" from-field=" > parameters.contactMechIdTo"/> > - <set field="contactMechTypeId" from-field=" > parameters.contactMechTypeId"/> > - > - <entity-one entity-name="Party" use-cache="true" > value-name="party"/> > - <entity-one entity-name="Person" use-cache="true" > value-name="lookupPerson"/> > - <entity-one entity-name="CommunicationEvent" > value-name="communicationEvent"/> > - <script > location="component://party/webapp/partymgr/WEB-INF/actions/communication/findCommEventContactMechs.bsh"/> > - </actions> > - <widgets> > - <decorator-screen name="CommonListResourceDecorator" > location="${parameters.mainDecoratorLocation}"> > - <decorator-section name="body"> > - <section> > - <widgets> > - <section> > - <condition> > - <not><if-empty > field-name="communicationEvent"/></not> > - </condition> > - <widgets> > - <label style="h1" text="${ > uiLabelMap.PartyEditCommunicationEvent}"/> > - </widgets> > - <fail-widgets> > - <label style="h1" text="${ > uiLabelMap.PartyNewCommunication}"/> > - </fail-widgets> > - </section> > - <section> > - <widgets> > - <container> > - <link style="smallSubmit" > target="EditCommunicationEvent?partyId=${partyId}&partyIdFrom=${partyId}" > text="${uiLabelMap.PartyNewCommunication}"/> > - <link style="smallSubmit" > target="EditCommunicationEvent?partyId=${partyId}&parentCommEventId=${communicationEventId}" > text="${uiLabelMap.PartyReply}"/> > - <!--<link style="smallSubmit" > target="EditCommunicationEvent?communicationEventTypeId=${ > communicationEvent.communicationEventTypeId}&contactMechIdTo=${ > communicationEvent.contactMechIdFrom}&contactMechIdFrom=${ > communicationEvent.contactMechIdTo > }&partyId=${partyId}&partyIdTo=${partyId}&partyIdFrom=${ > userLogin.partyId > }&parentCommEventId=${communicationEventId}&toString=${ > communicationEvent.fromString}" text="${uiLabelMap.PartyReply}"/>--> > - </container> > - </widgets> > - </section> > - <section> > - <condition> > - <if-compare > field-name="okayToUpdate" operator="equals" value="true" type="Boolean"/> > - </condition> > - <widgets> > - <container > style="widget-container"> > - <include-form > location="component://party/webapp/partymgr/communication/CommForms.xml" > name="EditCommEvent"/> > - </container> > - <container > style="widget-container"> > - <include-form > location="component://party/webapp/partymgr/communication/CommForms.xml" > name="ListChildCommEvents"/> > - </container> > - </widgets> > - <fail-widgets> > - <container > style="widget-container"> > - <include-form > location="component://party/webapp/partymgr/communication/CommForms.xml" > name="ViewCommEvent"/> > - </container> > - <container > style="widget-container"> > - <include-form > location="component://party/webapp/partymgr/communication/CommForms.xml" > name="ListChildCommEvents"/> > - </container> > - </fail-widgets> > - </section> > - </widgets> > - </section> > - </decorator-section> > - </decorator-screen> > - </widgets> > - </section> > - </screen> > - > - <screen name="EditPartyRates"> > - <section> > - <actions> > - <set field="titleProperty" > value="PageTitleEditPartyRates"/> > - <set field="headerItem" value="find"/> > - <set field="tabButtonItem" value="EditPartyRates"/> > - <set field="labelTitleProperty" > value="PageTitleEditPartyRates"/> > - > - <set field="partyId" from-field="parameters.partyId"/> > - </actions> > - <widgets> > - <decorator-screen name="CommonListResourceDecorator" > location="${parameters.mainDecoratorLocation}"> > - <decorator-section name="body"> > + </container> > + </widgets> > + </section> > + </decorator-section> > + </decorator-screen> > + </widgets> > + </section> > + </screen> > + > + <screen name="EditPerson"> > + <section> > + <actions> > + <set field="titleProperty" > value="PageTitleEditPersonalInformation"/> > + <set field="tabButtonItem" value="viewprofile"/> > + <set field="headerItem" value="create"/> > + <set field="labelTitleProperty" > value="PageTitleEditPersonalInformation"/> > + > + <set field="donePage" from-field="parameters.DONE_PAGE" > default-value="viewprofile"/> > + <set field="partyId" from-field="parameters.partyId"/> > + <entity-one entity-name="PartyAndPerson" > value-name="person"/> > + </actions> > + <widgets> > + <decorator-screen name="CommonListResourceDecorator" > location="${parameters.mainDecoratorLocation}"> > + <decorator-section name="body"> > + <include-form name="EditPerson" > location="component://party/webapp/partymgr/party/PartyForms.xml"/> > + </decorator-section> > + </decorator-screen> > + </widgets> > + </section> > + </screen> > + > + <screen name="AddPartyNote"> > + <section> > + <actions> > + <set field="titleProperty" > value="PageTitleNewPartyNote"/> > + <set field="tabButtonItem" value="viewprofile"/> > + <set field="labelTitleProperty" > value="PageTitleNewPartyNote"/> > + > + <set field="donePage" from-field="parameters.DONE_PAGE" > default-value="viewprofile"/> > + <set field="partyId" from-field="parameters.partyId"/> > + </actions> > + <widgets> > + <decorator-screen name="CommonListResourceDecorator" > location="${parameters.mainDecoratorLocation}"> > + <decorator-section name="body"> > + <container><label text="${ > uiLabelMap.PageTitleNewPartyNote}" style="h2"/></container> > + <include-form name="AddPartyNote" > location="component://party/webapp/partymgr/party/PartyForms.xml"/> > + </decorator-section> > + </decorator-screen> > + </widgets> > + </section> > + </screen> > + > + <screen name="editcontactmech"> > + <section> > + <actions> > + <set field="titleProperty" > value="PageTitleEditContactMech"/> > + <set field="headerItem" value="find"/> > + <set field="tabButtonItem" value="editcontactmech"/> > + > + <set field="labelTitleProperty" > value="PageTitleEditContactMech"/> > + > + <script > location="component://party/webapp/partymgr/WEB-INF/actions/HasPartyPermissions.bsh"/> > + <script > location="component://party/webapp/partymgr/WEB-INF/actions/party/editcontactmech.bsh"/> > + </actions> > + <widgets> > > [... 452 lines stripped ...] > > |
Re: svn commit: r633827 [2/2] - /ofbiz/trunk/specialpurpose/pr
|
|
Vikas Mayur schrieb:
> The actual patch has only a single line modification. I am not sure but I > may be doing any thing wrong here while committing the code. The commit > appears to have a lot of changes in the ProjectScreens.xml file, but the > actual changes to trunk has also a single line modification. > > > <screen name="NoteInfo"> > <section> > <actions> > - <set field="workEffortId" from-field=" > parameters.workEffortId"/> > + <set field="workEffortId" from-field="projectId" /> > <entity-and entity-name="WorkEffortNoteAndData" > list-name="workEffortNoteandDetails"> > <field-map field-name="workEffortId" > env-name="workEffortId"/> > <order-by field-name="-noteDateTime"/> > > Can any body point me if I am doing any thing wrong here. This is the result of a missing svn:eol-style property :-| If someone checks in a file with Windows linefeeds and then someone else edits this file under Linux all lines are changed - setting 'svn:eol-style' as 'native' fixes this problem. We should check the whole repository for missing eol-style properties - I'll try to find some time today. Doing a 'svn diff' before the commit helps avoiding these kind of problems ;-) -- Christian |
Re: svn commit: r633827 [2/2] - /ofbiz/trunk/specialpurpose/pr
|
|
Thanks Christian, you are right indeed.
Just another question around this topic. Here is what I try to do with specialpurpose/projectmgr/widget/forms/ProjectForms.xml $ svn propset svn:eol-style native specialpurpose/projectmgr/widget/forms/ProjectForms.xml $ svn: File 'specialpurpose/projectmgr/widget/forms/ProjectForms.xml' has inconsistent newlines $ svn: Inconsistent line ending style What should be done in this case to set this property. Vikas On Wed, Mar 5, 2008 at 6:31 PM, Christian Geisert < [hidden email]> wrote: > Vikas Mayur schrieb: > > The actual patch has only a single line modification. I am not sure but > I > > may be doing any thing wrong here while committing the code. The commit > > appears to have a lot of changes in the ProjectScreens.xml file, but the > > actual changes to trunk has also a single line modification. > > > > > > <screen name="NoteInfo"> > > <section> > > <actions> > > - <set field="workEffortId" from-field=" > > parameters.workEffortId"/> > > + <set field="workEffortId" from-field="projectId" /> > > <entity-and entity-name="WorkEffortNoteAndData" > > list-name="workEffortNoteandDetails"> > > <field-map field-name="workEffortId" > > env-name="workEffortId"/> > > <order-by field-name="-noteDateTime"/> > > > > Can any body point me if I am doing any thing wrong here. > > This is the result of a missing svn:eol-style property :-| > > If someone checks in a file with Windows linefeeds and then > someone else edits this file under Linux all lines are changed - > setting 'svn:eol-style' as 'native' fixes this problem. > > We should check the whole repository for missing eol-style properties - > I'll try to find some time today. > > Doing a 'svn diff' before the commit helps avoiding these kind of > problems ;-) > > -- > Christian > > |
Re: svn commit: r633827 [2/2] - /ofbiz/trunk/specialpurpose/pr
|
|
sorry ... it is
$ svn propset svn:eol-style native specialpurpose/projectmgr/widget/forms/ProjectForms.xml svn: File 'specialpurpose/projectmgr/widget/forms/ProjectForms.xml' has inconsistent newlines svn: Inconsistent line ending style On Wed, Mar 5, 2008 at 8:08 PM, Vikas Mayur <[hidden email]> wrote: > Thanks Christian, you are right indeed. > > Just another question around this topic. Here is what I try to do with > specialpurpose/projectmgr/widget/forms/ProjectForms.xml > > $ svn propset svn:eol-style native > specialpurpose/projectmgr/widget/forms/ProjectForms.xml > $ svn: File 'specialpurpose/projectmgr/widget/forms/ProjectForms.xml' has > inconsistent newlines > $ svn: Inconsistent line ending style > > What should be done in this case to set this property. > > > Vikas > > > On Wed, Mar 5, 2008 at 6:31 PM, Christian Geisert < > [hidden email]> wrote: > > > Vikas Mayur schrieb: > > > The actual patch has only a single line modification. I am not sure > > but I > > > may be doing any thing wrong here while committing the code. The > > commit > > > appears to have a lot of changes in the ProjectScreens.xml file, but > > the > > > actual changes to trunk has also a single line modification. > > > > > > > > > <screen name="NoteInfo"> > > > <section> > > > <actions> > > > - <set field="workEffortId" from-field=" > > > parameters.workEffortId"/> > > > + <set field="workEffortId" from-field="projectId" /> > > > <entity-and entity-name="WorkEffortNoteAndData" > > > list-name="workEffortNoteandDetails"> > > > <field-map field-name="workEffortId" > > > env-name="workEffortId"/> > > > <order-by field-name="-noteDateTime"/> > > > > > > Can any body point me if I am doing any thing wrong here. > > > > This is the result of a missing svn:eol-style property :-| > > > > If someone checks in a file with Windows linefeeds and then > > someone else edits this file under Linux all lines are changed - > > setting 'svn:eol-style' as 'native' fixes this problem. > > > > We should check the whole repository for missing eol-style properties - > > I'll try to find some time today. > > > > Doing a 'svn diff' before the commit helps avoiding these kind of > > problems ;-) > > > > -- > > Christian > > > > > |
Re: svn commit: r633827 [2/2] - /ofbiz/trunk/specialpurpose/pr
|
|
Vikas Mayur schrieb:
> sorry ... it is > > $ svn propset svn:eol-style native > specialpurpose/projectmgr/widget/forms/ProjectForms.xml > svn: File 'specialpurpose/projectmgr/widget/forms/ProjectForms.xml' has > inconsistent newlines > svn: Inconsistent line ending style This file already has mixed (CRLF and LF) line endings.. I'll fix it manually with dos2unix. -- Christian |
Re: svn commit: r633827 [2/2] - /ofbiz/trunk/specialpurpose/pr
|
|
Christian, thanks for taking care of this.
Now the commits look much better. Doing this for whole repository will take good time :) Vikas On Wed, Mar 5, 2008 at 9:32 PM, Christian Geisert < [hidden email]> wrote: > Vikas Mayur schrieb: > > sorry ... it is > > > > $ svn propset svn:eol-style native > > specialpurpose/projectmgr/widget/forms/ProjectForms.xml > > svn: File 'specialpurpose/projectmgr/widget/forms/ProjectForms.xml' has > > inconsistent newlines > > svn: Inconsistent line ending style > > This file already has mixed (CRLF and LF) line endings.. > I'll fix it manually with dos2unix. > > -- > Christian > > |
Re: svn commit: r633827 [2/2] - /ofbiz/trunk/specialpurpose/pr
Administrator
|
It takes only few minutes in Eclipse : "File/Convert Line Delimiters To" (from the project root). Also when you commit from Eclipse
(or even Tortoise under Windows IIRW) if the file has mixed EOL you can't commit it. Hence this Convert Line Delimiters To option... But the point is when adding new files, isn'it ? Since Subversion will automatically adapts EOL when commiting in repository if no specific EOL is specified for a file. Also I remember having forced EOL for platform specific files, like startofbiz.sh for instance. Hope it's not noise but usefull (not sure ;o) Jacques From: "Vikas Mayur" <[hidden email]> > Christian, thanks for taking care of this. > Now the commits look much better. > > Doing this for whole repository will take good time :) > > Vikas > > On Wed, Mar 5, 2008 at 9:32 PM, Christian Geisert < > [hidden email]> wrote: > >> Vikas Mayur schrieb: >> > sorry ... it is >> > >> > $ svn propset svn:eol-style native >> > specialpurpose/projectmgr/widget/forms/ProjectForms.xml >> > svn: File 'specialpurpose/projectmgr/widget/forms/ProjectForms.xml' has >> > inconsistent newlines >> > svn: Inconsistent line ending style >> >> This file already has mixed (CRLF and LF) line endings.. >> I'll fix it manually with dos2unix. >> >> -- >> Christian >> >> > |
«
Return to OFBiz - Dev
|
1 view|%1 views
| Free forum by Nabble | Edit this page |