You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2008/08/21 11:30:34 UTC
svn commit: r687663 - in /ofbiz/trunk/specialpurpose/projectmgr:
script/org/ofbiz/project/ProjectPermissionServices.xml
widget/TimeSheetScreens.xml widget/forms/ProjectForms.xml
widget/forms/TimeSheetForms.xml
Author: hansbak
Date: Thu Aug 21 02:30:33 2008
New Revision: 687663
URL: http://svn.apache.org/viewvc?rev=687663&view=rev
Log:
change order of project drop down, fix of timesheet display, remove log messages
Modified:
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml?rev=687663&r1=687662&r2=687663&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml Thu Aug 21 02:30:33 2008
@@ -54,7 +54,7 @@
<!-- PROJECT -->
<if-compare field="sec_object" value="PROJECT" operator="equals">
- <log level="info" message="======ProjectMGR Security===== action: ${parameters.mainAction} object: ${sec_object} Id: ${parameters.projectId} resourceDescription: ${parameters.resourceDescription}"/>
+ <!--log level="info" message="======ProjectMGR Security===== action: ${parameters.mainAction} object: ${sec_object} Id: ${parameters.projectId} resourceDescription: ${parameters.resourceDescription}"/-->
<set field="projectId" from-field="parameters.projectId"/>
<set field="partyId" from-field="parameters.userLogin.partyId"/>
<call-simple-method method-name="checkProjectMembership"/>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml?rev=687663&r1=687662&r2=687663&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml Thu Aug 21 02:30:33 2008
@@ -186,8 +186,7 @@
<set field="tabButtonItem" value="edittimesheet"/>
<set field="labelTitleProperty" value="PageTitleAddTimesheet"/>
<set field="my" value="My"/><!-- change link and target -->
- <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
- <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="10"/>
+ <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.bsh"/>
</actions>
<widgets>
<decorator-screen name="CommonMyTimeDecorator" location="${parameters.mainDecoratorLocation}">
@@ -266,9 +265,6 @@
</screen>
<screen name="CurrentTimesheet">
<section>
- <actions>
- <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.bsh"/>
- </actions>
<widgets>
<screenlet title="${uiLabelMap.PageTitleCurrentTimesheet} ${uiLabelMap.CommonNbr} ${timesheet.timesheetId} ${uiLabelMap.ProjectMgrWeek}: ${weekNumber} ${uiLabelMap.CommonFrom} ${bsh:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo} ${bsh:timesheet.get("thruDate").toString().substring(0,10)}"
navigation-menu-name="TimesheetBar">
@@ -300,12 +296,8 @@
<screen name="ListTimesheets">
<section>
<actions>
- <entity-and entity-name="Timesheet" list-name="timesheets">
- <field-map field-name="partyId" env-name="userLogin.partyId"/>
- <order-by field-name="-fromDate"/>
- </entity-and>
<entity-one entity-name="PartyNameView" value-name="partyNameView">
- <field-map field-name="partyId" env-name="userLogin.partyId"/>
+ <field-map field-name="partyId" env-name="timesheet.partyId"/>
</entity-one>
</actions>
<widgets>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=687663&r1=687662&r2=687663&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Thu Aug 21 02:30:33 2008
@@ -524,7 +524,7 @@
<field name="partyId"><hidden/></field>
<field entry-name="test" name="workEffortId" title="${uiLabelMap.ProjectMgrTaskName}"><!-- task level -->
<drop-down allow-empty="false">
- <entity-options entity-name="ProjectPartyAndPhaseAndTask" description="${workEffortName} (${phaseName}-${projectName})">
+ <entity-options entity-name="ProjectPartyAndPhaseAndTask" description="${projectName} -- ${phaseName} -- ${workEffortName}">
<entity-constraint name="partyId" env-name="parameters.partyId"/>
<entity-constraint name="workEffortTypeId" value="TASK"/>
<entity-constraint name="currentStatusId" operator="equals" value="PTS_CREATED"/>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml?rev=687663&r1=687662&r2=687663&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml Thu Aug 21 02:30:33 2008
@@ -26,7 +26,7 @@
<field name="fromDate"><hidden/></field>
<field name="workEffortId" title="${uiLabelMap.ProjectMgrTaskName}">
<drop-down allow-empty="true">
- <entity-options entity-name="ProjectPartyAndPhaseAndTask" description="${workEffortName} -- ${phaseName} -- ${projectName}">
+ <entity-options entity-name="ProjectPartyAndPhaseAndTask" description="${projectName} -- ${phaseName} -- ${workEffortName}">
<entity-constraint name="workEffortTypeId" operator="not-equals" value="TASK_TEMPLATE"/>
<entity-constraint name="partyId" env-name="timesheet.partyId"/>
<entity-order-by field-name="projectName"/>