Author: hansbak
Date: Sat Jul 4 12:07:26 2009
New Revision: 791109
URL: http://svn.apache.org/viewvc?rev=791109&view=rev
Log:
tested asset maint component for new calendar porlet and found unused
controller entry
Modified:
ofbiz/trunk/applications/workeffort/data/WorkEffortDemoData.xml
ofbiz/trunk/applications/workeffort/widget/CalendarForms.xml
ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml
Modified: ofbiz/trunk/applications/workeffort/data/WorkEffortDemoData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/data/WorkEffortDemoData.xml?rev=791109&r1=791108&r2=791109&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/data/WorkEffortDemoData.xml (original)
+++ ofbiz/trunk/applications/workeffort/data/WorkEffortDemoData.xml Sat Jul 4
12:07:26 2009
@@ -27,7 +27,7 @@
<TemporalExpressionAssoc fromTempExprId="STAFF_MTG"
toTempExprId="1ST_MONDAY_IN_MONTH"/>
<TemporalExpressionAssoc fromTempExprId="STAFF_MTG" toTempExprId="10AM"/>
<FixedAsset fixedAssetId="DEMO_PROJECTOR" fixedAssetName="Overhead
Projector" fixedAssetTypeId="EQUIPMENT"/>
- <WorkEffort workEffortId="STAFF_MTG" workEffortTypeId="MEETING"
currentStatusId="CAL_TENTATIVE" lastStatusUpdate="2008-01-01 00:00:00.0"
scopeEnumId="WES_PRIVATE" workEffortName="Staff Meeting" description="Staff
Meeting" tempExprId="STAFF_MTG" estimatedStartDate="2008-01-01 00:00:00.0"
estimatedMilliSeconds="3600000"/>
+ <WorkEffort workEffortId="STAFF_MTG" workEffortTypeId="MEETING"
currentStatusId="CAL_TENTATIVE" lastStatusUpdate="2008-01-01 00:00:00.0"
scopeEnumId="WES_PRIVATE" workEffortName="Staff Meeting first monday of the
month" description="Staff Meeting" tempExprId="STAFF_MTG"
estimatedStartDate="2008-01-01 00:00:00.0" estimatedMilliSeconds="3600000"/>
<WorkEffortFixedAssetAssign workEffortId="STAFF_MTG"
fixedAssetId="DEMO_PROJECTOR" statusId="FA_ASGN_REQUESTED"
availabilityStatusId="WEFA_IN_USE" fromDate="2008-01-01 00:00:00.0"/>
<WorkEffortPartyAssignment workEffortId="STAFF_MTG"
partyId="DemoEmployee1" statusId="PRTYASGN_ASSIGNED" roleTypeId="CAL_OWNER"
availabilityStatusId="WEPA_AV_BUSY" fromDate="2008-01-01 00:00:00.0"/>
<WorkEffortPartyAssignment workEffortId="STAFF_MTG"
partyId="DemoEmployee2" statusId="PRTYASGN_ASSIGNED" roleTypeId="CAL_ATTENDEE"
availabilityStatusId="WEPA_AV_BUSY" fromDate="2008-01-01 00:00:00.0"/>
Modified: ofbiz/trunk/applications/workeffort/widget/CalendarForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CalendarForms.xml?rev=791109&r1=791108&r2=791109&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/CalendarForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/CalendarForms.xml Sat Jul 4
12:07:26 2009
@@ -109,7 +109,7 @@
</form>
<form name="addCalEventRole" type="single"
target="createWorkEffortPartyAssign">
<field name="workEffortId"><hidden
value="${parameters.workEffortId}"/></field>
- <field name="statusId" use-when="workEffort==null"><hidden
value="PRTYASGN_ASSIGNED"/></field>
+ <field name="statusId"><hidden value="PRTYASGN_ASSIGNED"/></field>
<field name="partyId" position="1"><lookup
target-form-name="LookupPartyName" size="10"></lookup></field>
<field name="roleTypeId" position="2">
<drop-down no-current-selected-key="CAL_ATTENDEE">
Modified:
ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml?rev=791109&r1=791108&r2=791109&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml
(original)
+++
ofbiz/trunk/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/controller.xml
Sat Jul 4 12:07:26 2009
@@ -54,11 +54,6 @@
<security https="true" auth="true"/>
<response name="success" type="view" value="FindFixedAssetMaints"/>
</request-map>
- <request-map uri="ListFixedAssetCalendar">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="month"/>
- <response name="error" type="view" value="month"/>
- </request-map>
<!-- WorkEffort request mappings -->
<request-map uri="EditWorkEfforts">
