Author: adrianc
Date: Fri Jan 8 16:54:47 2010
New Revision: 897261
URL: http://svn.apache.org/viewvc?rev=897261&view=rev
Log:
Add full iCalendar URL to the Find iCalendar screen. Patch contributed by Chris
Snow (https://issues.apache.org/jira/browse/OFBIZ-3400) with additional changes
by me.
Modified:
ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=897261&r1=897260&r2=897261&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Fri Jan 8
16:54:47 2010
@@ -1351,11 +1351,14 @@
</form>
<form name="EditICalendar" default-map-name="workEffort"
target="updateICalendar" type="single">
+ <actions>
+ <set field="serverRootUrl" value="${bsh:
org.ofbiz.base.util.UtilHttp.getServerRootUrl(request)}"/>
+ </actions>
<alt-target target="createICalendar" use-when="workEffort==null"/>
<field name="workEffortTypeId"><hidden
value="PUBLISH_PROPS"></hidden></field>
<field name="currentStatusId"><hidden
value="CAL_CANCELLED"></hidden></field>
<field name="quickAssignPartyId"
title="${uiLabelMap.WorkEffortICalendarOwner}" use-when="workEffort==null @and
workEffortId==null"><lookup target-form-name="LookupPartyName"/></field>
- <field name="workEffortId" use-when="workEffort!=null"
title="${uiLabelMap.WorkEffortICalendarUrl}"><display
description="/iCalendar/${workEffortId}/"/></field>
+ <field name="workEffortId" use-when="workEffort!=null"
title="${uiLabelMap.WorkEffortICalendarUrl}"><display
description="${serverRootUrl}/iCalendar/${workEffortId}/"/></field>
<field name="workEffortName"
title="${uiLabelMap.WorkEffortICalendarName}" widget-style="required"
tooltip="${uiLabelMap.CommonRequired}"><text/></field>
<field name="scopeEnumId"
title="${uiLabelMap.WorkEffortICalendarVisibility}">
<drop-down no-current-selected-key="WES_PRIVATE">
@@ -1424,12 +1427,16 @@
<field-map field-name="partyId"
from-field="userLogin.partyId"/>
<field-map field-name="statusId" value="PRTYASGN_ASSIGNED"/>
</entity-and>
+ <set field="serverRootUrl" value="${bsh:
org.ofbiz.base.util.UtilHttp.getServerRootUrl(request)}"/>
</actions>
- <field name="workEffortId"
title="${uiLabelMap.WorkEffortICalendarUrl}">
- <hyperlink also-hidden="false"
description="/iCalendar/${workEffortId}/" target="EditICalendar"
target-type="plain">
+ <field name="workEffortId"
title="${uiLabelMap.WorkEffortWorkEffortId}">
+ <hyperlink also-hidden="false" description="${workEffortId}"
target="EditICalendar" target-type="plain">
<parameter param-name="workEffortId"/>
</hyperlink>
</field>
+ <field name="iCalendarUrl"
title="${uiLabelMap.WorkEffortICalendarUrl}">
+ <hyperlink also-hidden="false"
description="${serverRootUrl}/iCalendar/${workEffortId}/"
target="${serverRootUrl}/iCalendar/${workEffortId}/" target-type="plain"/>
+ </field>
<field name="workEffortName"
title="${uiLabelMap.WorkEffortICalendarName}"><display/></field>
</form>
