svn commit: r790650 - in /ofbiz/trunk/applications/work
Locked
 
|
Author: adrianc
Date: Thu Jul 2 16:25:27 2009 New Revision: 790650 URL: http://svn.apache.org/viewvc?rev=790650&view=rev Log: Moved the iCalendar controller.xml entries into their own file - so they can be included in other apps without having to include all of work effort. Plus some minor fixes to the UI. Added: ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/icalendar-controller.xml (with props) Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml?rev=790650&r1=790649&r2=790650&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml Thu Jul 2 16:25:27 2009 @@ -21,6 +21,7 @@ <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd"> <include location="component://common/webcommon/WEB-INF/common-controller.xml"/> + <include location="component://workeffort/webapp/workeffort/WEB-INF/icalendar-controller.xml"/> <description>Work Manager Module Site Configuration File</description> <owner>Copyright 2001-2009 The Apache Software Foundation</owner> @@ -126,68 +127,6 @@ <response name="error" type="view" value="ListWorkEfforts"/> </request-map> - <!-- iCalendar requests and events --> - <request-map uri="EditICalendar"> - <security https="true" auth="true"/> - <response name="success" type="view" value="EditICalendar"/> - </request-map> - <request-map uri="ICalendarChildren"> - <security https="true" auth="true"/> - <response name="success" type="view" value="ICalendarChildren"/> - </request-map> - <request-map uri="ICalendarParties"> - <security https="true" auth="true"/> - <response name="success" type="view" value="ICalendarParties"/> - </request-map> - <request-map uri="ICalendarFixedAssets"> - <security https="true" auth="true"/> - <response name="success" type="view" value="ICalendarFixedAssets"/> - </request-map> - <request-map uri="FindICalendars"> - <security https="true" auth="true"/> - <response name="success" type="view" value="FindICalendars"/> - </request-map> - <request-map uri="ICalendarHelp"> - <security https="true" auth="true"/> - <response name="success" type="view" value="ICalendarHelp"/> - </request-map> - <request-map uri="createICalendar"> - <security https="true" auth="true"/> - <event type="service" invoke="createWorkEffort"/> - <response name="success" type="view-home" value="EditICalendar"/> - <response name="error" type="view" value="EditICalendar"/> - </request-map> - <request-map uri="updateICalendar"> - <security https="true" auth="true"/> - <event type="service" invoke="updateWorkEffort"/> - <response name="success" type="view-home" value="EditICalendar"/> - <response name="error" type="view" value="EditICalendar"/> - </request-map> - <request-map uri="createICalendarPartyAssign"> - <security https="true" auth="true"/> - <event type="service" invoke="assignPartyToWorkEffort"/> - <response name="success" type="view-home" value="ICalendarParties"/> - <response name="error" type="view-home" value="ICalendarParties"/> - </request-map> - <request-map uri="updateICalendarPartyAssign"> - <security https="true" auth="true"/> - <event type="service" invoke="updatePartyToWorkEffortAssignment"/> - <response name="success" type="view" value="ICalendarParties"/> - <response name="error" type="view" value="ICalendarParties"/> - </request-map> - <request-map uri="createICalendarFixedAssetAssign"> - <security https="true" auth="true"/> - <event type="service" invoke="createWorkEffortFixedAssetAssign"/> - <response name="success" type="view" value="ICalendarFixedAssets"/> - <response name="error" type="view" value="ICalendarFixedAssets"/> - </request-map> - <request-map uri="updateICalendarFixedAssetAssign"> - <security https="true" auth="true"/> - <event type="service" invoke="updateWorkEffortFixedAssetAssign"/> - <response name="success" type="view" value="ICalendarFixedAssets"/> - <response name="error" type="view" value="ICalendarFixedAssets"/> - </request-map> - <request-map uri="ListWorkEffortFixedAssetAssigns"> <security https="true" auth="true"/> <response name="success" type="view" value="ListWorkEffortFixedAssetAssigns"/> @@ -751,13 +690,6 @@ <view-map name="EditWorkEffortAssoc" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#EditWorkEffortAssoc"/> <view-map name="AddWorkEffortAssoc" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#AddWorkEffortAssoc"/> - <view-map name="EditICalendar" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#EditICalendar"/> - <view-map name="ICalendarChildren" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#ICalendarChildren"/> - <view-map name="ICalendarParties" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#ICalendarParties"/> - <view-map name="ICalendarFixedAssets" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#ICalendarFixedAssets"/> - <view-map name="FindICalendars" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#FindICalendars"/> - <view-map name="ICalendarHelp" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#ICalendarHelp"/> - <view-map name="ListWorkEffortEventReminders" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#ListWorkEffortEventReminders"/> <view-map name="ListWorkEffortFixedAssetAssigns" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#ListWorkEffortFixedAssetAssigns"/> <view-map name="ListWorkEffortPartyAssigns" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#ListWorkEffortPartyAssigns"/> Added: ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/icalendar-controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/icalendar-controller.xml?rev=790650&view=auto ============================================================================== --- ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/icalendar-controller.xml (added) +++ ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/icalendar-controller.xml Thu Jul 2 16:25:27 2009 @@ -0,0 +1,110 @@ +<?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. +--> + +<site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd"> + <include location="component://common/webcommon/WEB-INF/common-controller.xml"/> + <description>iCalendar UI Configuration File</description> + <owner>Copyright 2001-2009 The Apache Software Foundation</owner> + + <!-- Events to run on every request before security (chains exempt) --> + <!-- + <preprocessor> + </preprocessor> + --> + <!-- Events to run on every request after all other processing (chains exempt) --> + <!-- + <postprocessor> + <event name="test" type="java" path="org.ofbiz.webapp.event.TestEvent" invoke="test"/> + </postprocessor> + --> + + <!-- Request Mappings --> + + <request-map uri="EditICalendar"> + <security https="true" auth="true"/> + <response name="success" type="view" value="EditICalendar"/> + </request-map> + <request-map uri="ICalendarChildren"> + <security https="true" auth="true"/> + <response name="success" type="view" value="ICalendarChildren"/> + </request-map> + <request-map uri="ICalendarParties"> + <security https="true" auth="true"/> + <response name="success" type="view" value="ICalendarParties"/> + </request-map> + <request-map uri="ICalendarFixedAssets"> + <security https="true" auth="true"/> + <response name="success" type="view" value="ICalendarFixedAssets"/> + </request-map> + <request-map uri="FindICalendars"> + <security https="true" auth="true"/> + <response name="success" type="view" value="FindICalendars"/> + </request-map> + <request-map uri="ICalendarHelp"> + <security https="true" auth="true"/> + <response name="success" type="view" value="ICalendarHelp"/> + </request-map> + <request-map uri="createICalendar"> + <security https="true" auth="true"/> + <event type="service" invoke="createWorkEffort"/> + <response name="success" type="view-home" value="EditICalendar"/> + <response name="error" type="view" value="EditICalendar"/> + </request-map> + <request-map uri="updateICalendar"> + <security https="true" auth="true"/> + <event type="service" invoke="updateWorkEffort"/> + <response name="success" type="view-home" value="EditICalendar"/> + <response name="error" type="view" value="EditICalendar"/> + </request-map> + <request-map uri="createICalendarPartyAssign"> + <security https="true" auth="true"/> + <event type="service" invoke="assignPartyToWorkEffort"/> + <response name="success" type="view-home" value="ICalendarParties"/> + <response name="error" type="view-home" value="ICalendarParties"/> + </request-map> + <request-map uri="updateICalendarPartyAssign"> + <security https="true" auth="true"/> + <event type="service" invoke="updatePartyToWorkEffortAssignment"/> + <response name="success" type="view" value="ICalendarParties"/> + <response name="error" type="view" value="ICalendarParties"/> + </request-map> + <request-map uri="createICalendarFixedAssetAssign"> + <security https="true" auth="true"/> + <event type="service" invoke="createWorkEffortFixedAssetAssign"/> + <response name="success" type="view" value="ICalendarFixedAssets"/> + <response name="error" type="view" value="ICalendarFixedAssets"/> + </request-map> + <request-map uri="updateICalendarFixedAssetAssign"> + <security https="true" auth="true"/> + <event type="service" invoke="updateWorkEffortFixedAssetAssign"/> + <response name="success" type="view" value="ICalendarFixedAssets"/> + <response name="error" type="view" value="ICalendarFixedAssets"/> + </request-map> + + <!-- View Mappings --> + + <view-map name="EditICalendar" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#EditICalendar"/> + <view-map name="ICalendarChildren" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#ICalendarChildren"/> + <view-map name="ICalendarParties" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#ICalendarParties"/> + <view-map name="ICalendarFixedAssets" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#ICalendarFixedAssets"/> + <view-map name="FindICalendars" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#FindICalendars"/> + <view-map name="ICalendarHelp" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#ICalendarHelp"/> +</site-conf> Propchange: ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/icalendar-controller.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/icalendar-controller.xml ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/applications/workeffort/webapp/workeffort/WEB-INF/icalendar-controller.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=790650&r1=790649&r2=790650&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Thu Jul 2 16:25:27 2009 @@ -1397,7 +1397,7 @@ <form name="ListIcalendars" list-name="listIt" type="list" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> - <entity-and entity-name="WorkEffortAndPartyAssign" list="listIt"> + <entity-and entity-name="WorkEffortAndPartyAssign" list="listIt" filter-by-date="true"> <field-map field-name="workEffortTypeId" value="PUBLISH_PROPS"/> <field-map field-name="partyId" from-field="userLogin.partyId"/> <field-map field-name="statusId" value="PRTYASGN_ASSIGNED"/> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml?rev=790650&r1=790649&r2=790650&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml Thu Jul 2 16:25:27 2009 @@ -872,6 +872,7 @@ <section> <actions> <set field="headerItem" value="WorkEffortICalendar"/> + <set field="title" value="${uiLabelMap.WorkEffortICalendarFind}"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -882,7 +883,7 @@ </condition> <widgets> <container style="h1"> - <label text="${uiLabelMap.WorkEffortICalendarFind}"/> + <label text="${title}"/> </container> <container style="button-bar"> <link text="${uiLabelMap.CommonCreate}" target="EditICalendar" style="buttontext"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |