You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by sa...@apache.org on 2011/09/20 19:46:24 UTC
svn commit: r1173274 [12/13] - in /ofbiz/branches/jackrabbit20100709: ./
applications/accounting/config/ applications/accounting/entitydef/
applications/accounting/script/org/ofbiz/accounting/invoice/
applications/accounting/script/org/ofbiz/accounting...
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl Tue Sep 20 17:46:13 2011
@@ -117,12 +117,12 @@ function setAlternateGwp(field) {
<fieldset>
${uiLabelMap.EcommerceProductNumber}<input type="text" class="inputBox" name="add_product_id" value="${requestParameters.add_product_id?if_exists}" />
<#-- check if rental data present insert extra fields in Quick Add-->
- <#if product?exists && product.getString("productTypeId") == "ASSET_USAGE">
- ${uiLabelMap.EcommerceStartDate}: <input type="text" class="inputBox" size="10" name="reservStart" value=${requestParameters.reservStart?default("")} />
- ${uiLabelMap.EcommerceLength}: <input type="text" class="inputBox" size="2" name="reservLength" value=${requestParameters.reservLength?default("")} />
+ <#if (product?exists && product.getString("productTypeId") == "ASSET_USAGE") || (product?exists && product.getString("productTypeId") == "ASSET_USAGE_OUT_IN")>
+ ${uiLabelMap.EcommerceStartDate}: <input type="text" class="inputBox" size="10" name="reservStart" value="${requestParameters.reservStart?default("")}" />
+ ${uiLabelMap.EcommerceLength}: <input type="text" class="inputBox" size="2" name="reservLength" value="${requestParameters.reservLength?default("")}" />
</div>
<div>
- ${uiLabelMap.OrderNbrPersons}: <input type="text" class="inputBox" size="3" name="reservPersons" value=${requestParameters.reservPersons?default("1")} />
+ ${uiLabelMap.OrderNbrPersons}: <input type="text" class="inputBox" size="3" name="reservPersons" value="${requestParameters.reservPersons?default("1")}" />
</#if>
${uiLabelMap.CommonQuantity}: <input type="text" class="inputBox" size="5" name="quantity" value="${requestParameters.quantity?default("1")}" />
<input type="submit" class="smallSubmit" value="${uiLabelMap.OrderAddToCart}" />
@@ -182,8 +182,22 @@ function setAlternateGwp(field) {
<#else>
<th scope="row"> </th>
</#if>
- <#if fixedAssetExist == true><td><table><tr><td class="tabletext">- ${uiLabelMap.EcommerceStartDate} -</td><td class="tabletext">- ${uiLabelMap.EcommerceNbrOfDays} -</td></tr><tr><td class="tabletext" >- ${uiLabelMap.EcommerceNbrOfPersons} -</td><td class="tabletext" >- ${uiLabelMap.CommonQuantity} -</td></tr></table></td>
- <#else><th scope="row">${uiLabelMap.CommonQuantity}</th></#if>
+ <#if fixedAssetExist == true>
+ <td>
+ <table>
+ <tr>
+ <td class="tabletext">- ${uiLabelMap.EcommerceStartDate} -</td>
+ <td class="tabletext">- ${uiLabelMap.EcommerceNbrOfDays} -</td>
+ </tr>
+ <tr>
+ <td class="tabletext" >- ${uiLabelMap.EcommerceNbrOfPersons} -</td>
+ <td class="tabletext" >- ${uiLabelMap.CommonQuantity} -</td>
+ </tr>
+ </table>
+ </td>
+ <#else>
+ <th scope="row">${uiLabelMap.CommonQuantity}</th>
+ </#if>
<th scope="row">${uiLabelMap.EcommerceUnitPrice}</th>
<th scope="row">${uiLabelMap.EcommerceAdjustments}</th>
<th scope="row">${uiLabelMap.EcommerceItemTotal}</th>
@@ -304,14 +318,33 @@ function setAlternateGwp(field) {
<td>
<#if cartLine.getIsPromo() || cartLine.getShoppingListId()?exists>
- <#if fixedAssetExist == true><#if cartLine.getReservStart()?exists><table ><tr><td> </td><td class="tabletext">${cartLine.getReservStart()?string("yyyy-mm-dd")}</td><td class="tabletext">${cartLine.getReservLength()?string.number}</td></tr><tr><td> </td><td class="tabletext">${cartLine.getReservPersons()?string.number}</td><td class="tabletext"><#else>
- <table ><tr><td >--</td><td>--</td></tr><tr><td>--</td><td class="tabletext"> </#if>
+ <#if fixedAssetExist == true>
+ <#if cartLine.getReservStart()?exists>
+ <table >
+ <tr>
+ <td> </td>
+ <td class="tabletext">${cartLine.getReservStart()?string("yyyy-mm-dd")}</td>
+ <td class="tabletext">${cartLine.getReservLength()?string.number}</td></tr>
+ <tr>
+ <td> </td>
+ <td class="tabletext">${cartLine.getReservPersons()?string.number}</td>
+ <td class="tabletext">
+ <#else>
+ <table >
+ <tr>
+ <td >--</td>
+ <td>--</td>
+ </tr>
+ <tr>
+ <td>--</td>
+ <td class="tabletext">
+ </#if>
${cartLine.getQuantity()?string.number}</td></tr></table>
<#else><#-- fixedAssetExist -->
${cartLine.getQuantity()?string.number}
</#if>
<#else><#-- Is Promo or Shoppinglist -->
- <#if fixedAssetExist == true><#if cartLine.getReservStart()?exists><table><tr><td> </td><td><input type="text" class="inputBox" size="10" name="reservStart_${cartLineIndex}" value=${cartLine.getReservStart()?string}/></td><td><input type="text" class="inputBox" size="2" name="reservLength_${cartLineIndex}" value=${cartLine.getReservLength()?string.number}/></td></tr><tr><td> </td><td><input type="text" class="inputBox" size="3" name="reservPersons_${cartLineIndex}" value=${cartLine.getReservPersons()?string.number} /></td><td class="tabletext"><#else>
+ <#if fixedAssetExist == true><#if cartLine.getReservStart()?exists><table><tr><td> </td><td><input type="text" class="inputBox" size="10" name="reservStart_${cartLineIndex}" value=${cartLine.getReservStart()?string}/></td><td><input type="text" class="inputBox" size="2" name="reservLength_${cartLineIndex}" value="${cartLine.getReservLength()?string.number}"/></td></tr><tr><td> </td><td><input type="text" class="inputBox" size="3" name="reservPersons_${cartLineIndex}" value=${cartLine.getReservPersons()?string.number} /></td><td class="tabletext"><#else>
<table><tr><td>--</td><td>--</td></tr><tr><td>--</td><td class="tabletext"></#if>
<input size="6" class="inputBox" type="text" name="update_${cartLineIndex}" value="${cartLine.getQuantity()?string.number}" /></td></tr></table>
<#else><#-- fixedAssetExist -->
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl Tue Sep 20 17:46:13 2011
@@ -219,7 +219,7 @@ ${virtualVariantJavaScript?if_exists}
}
function additemSubmit(){
- <#if product.productTypeId?if_exists == "ASSET_USAGE">
+ <#if product.productTypeId?if_exists == "ASSET_USAGE" || product.productTypeId?if_exists == "ASSET_USAGE_OUT_IN">
newdatevalue = validate(document.addform.reservStart.value);
if (newdatevalue == false) {
document.addform.reservStart.focus();
@@ -233,7 +233,7 @@ ${virtualVariantJavaScript?if_exists}
}
function addShoplistSubmit(){
- <#if product.productTypeId?if_exists == "ASSET_USAGE">
+ <#if product.productTypeId?if_exists == "ASSET_USAGE" || product.productTypeId?if_exists == "ASSET_USAGE_OUT_IN">
if (document.addToShoppingList.reservStartStr.value == "") {
document.addToShoppingList.submit();
} else {
@@ -456,7 +456,7 @@ ${virtualVariantJavaScript?if_exists}
<#assign priceStyle = "regularPrice" />
</#if>
${uiLabelMap.OrderYourPrice}: <#if "Y" = product.isVirtual?if_exists> ${uiLabelMap.CommonFrom} </#if><span class="${priceStyle}"><@ofbizCurrency amount=price.price isoCode=price.currencyUsed /></span>
- <#if product.productTypeId?if_exists == "ASSET_USAGE">
+ <#if product.productTypeId?if_exists == "ASSET_USAGE" || product.productTypeId?if_exists == "ASSET_USAGE_OUT_IN">
<#if product.reserv2ndPPPerc?exists && product.reserv2ndPPPerc != 0><br /><span class="${priceStyle}">${uiLabelMap.ProductReserv2ndPPPerc}<#if !product.reservNthPPPerc?exists || product.reservNthPPPerc == 0>${uiLabelMap.CommonUntil} ${product.reservMaxPersons?if_exists}</#if> <@ofbizCurrency amount=product.reserv2ndPPPerc*price.price/100 isoCode=price.currencyUsed /></span></#if>
<#if product.reservNthPPPerc?exists &&product.reservNthPPPerc != 0><br /><span class="${priceStyle}">${uiLabelMap.ProductReservNthPPPerc} <#if !product.reserv2ndPPPerc?exists || product.reserv2ndPPPerc == 0>${uiLabelMap.ProductReservSecond} <#else> ${uiLabelMap.ProductReservThird} </#if> ${uiLabelMap.CommonUntil} ${product.reservMaxPersons?if_exists}, ${uiLabelMap.ProductEach}: <@ofbizCurrency amount=product.reservNthPPPerc*price.price/100 isoCode=price.currencyUsed /></span></#if>
<#if (!product.reserv2ndPPPerc?exists || product.reserv2ndPPPerc == 0) && (!product.reservNthPPPerc?exists || product.reservNthPPPerc == 0)><br />${uiLabelMap.ProductMaximum} ${product.reservMaxPersons?if_exists} ${uiLabelMap.ProductPersons}.</#if>
@@ -629,16 +629,17 @@ ${virtualVariantJavaScript?if_exists}
<span style="white-space: nowrap;"><strong>${uiLabelMap.CommonAmount}:</strong></span>
<input type="text" size="5" name="add_amount" value=""/>
</div>
- <#if product.productTypeId?if_exists == "ASSET_USAGE">
- <div class="inline">
- <label>Start Date(yyyy-mm-dd)</label><@htmlTemplate.renderDateTimeField event="" action="" name="reservStart" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="reservStart1" dateType="date" shortDateInput=true timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
- <label>End Date(yyyy-mm-dd)</label><@htmlTemplate.renderDateTimeField event="" action="" name="reservEnd" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="reservEnd1" dateType="date" shortDateInput=true timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+ <#if product.productTypeId?if_exists == "ASSET_USAGE" || product.productTypeId?if_exists == "ASSET_USAGE_OUT_IN">
+ <div>
+ <label>Start Date(yyyy-mm-dd)</label><@htmlTemplate.renderDateTimeField event="" action="" name="reservStart" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${startDate}" size="25" maxlength="30" id="reservStart1" dateType="date" shortDateInput=true timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</div>
<div>
<#--td nowrap="nowrap" align="right">Number<br />of days</td><td><input type="textt" size="4" name="reservLength"/></td></tr><tr><td> </td><td align="right" nowrap="nowrap"> </td-->
+ Number of days<input type="text" size="4" name="reservLength" value=""/>
Number of persons<input type="text" size="4" name="reservPersons" value="2"/>
Number of rooms<input type="text" size="5" name="quantity" value="1"/>
</div>
+ <a href="javascript:addItem()" class="buttontext"><span style="white-space: nowrap;">${uiLabelMap.OrderAddToCart}</span></a>
<#else>
<span><input name="quantity" id="quantity" value="1" size="4" maxLength="4" type="text" <#if product.isVirtual!?upper_case == "Y">disabled="disabled"</#if> /></span><a href="javascript:addItem()" id="addToCart" name="addToCart" class="buttontext">${uiLabelMap.OrderAddToCart}</a>
<@showUnavailableVarients/>
@@ -689,8 +690,12 @@ ${virtualVariantJavaScript?if_exists}
<option value="">${uiLabelMap.OrderNewShoppingList}</option>
</select>
+ <#--assign nowDate = Static["org.ofbiz.base.util.UtilDateTime"].nowDateString("yyyy-MM-dd")-->
<#if product.productTypeId?if_exists == "ASSET_USAGE">
- ${uiLabelMap.CommonStartDate} (yyyy-mm-dd)<input type="text" size="10" name="reservStartStr" />Number of days<input type="text" size="4" name="reservLength" /> Number of persons<input type="text" size="4" name="reservPersons" value="1" />Qty <input type="text" size="5" name="quantity" value="1" />
+ ${uiLabelMap.CommonStartDate} (yyyy-mm-dd)<@htmlTemplate.renderDateTimeField name="reservStartStr" event="" action="" value="${startDate}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="15" maxlength="30" id="reservStartStr" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> Number of days <input type="text" size="4" name="reservLength" /> <br/>Number of persons <input type="text" size="4" name="reservPersons" value="1" /> Qty <input type="text" size="5" name="quantity" value="1" />
+ <#elseif product.productTypeId?if_exists == "ASSET_USAGE_OUT_IN">
+ ${uiLabelMap.CommonStartDate} (yyyy-mm-dd) <@htmlTemplate.renderDateTimeField name="reservStartStr" event="" action="" value="${startDate}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="15" maxlength="30" id="reservStartStr" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> Number of days <input type="text" size="4" name="reservLength" /><input type="hidden" size="4" name="reservPersons" value="1" /><br/>
+ Qty <input type="text" size="5" name="quantity" value="1" />
<#else>
<input type="text" size="5" name="quantity" value="1" />
<input type="hidden" name="reservStartStr" value= "" />
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl Tue Sep 20 17:46:13 2011
@@ -21,8 +21,8 @@ under the License.
<#macro contactList publicEmailContactLists>
<select name="contactListId" class="selectBox" style="width:134px">
<#list publicEmailContactLists as publicEmailContactList>
- <#assign publicContactMechType = publicEmailContactList.getRelatedOneCache("ContactMechType")?if_exists>
- <option value="${publicEmailContactList.contactListId}">${publicEmailContactList.contactListName?if_exists}</option>
+ <#assign publicContactMechType = publicEmailContactList.contactList.getRelatedOneCache("ContactMechType")?if_exists>
+ <option value="${publicEmailContactList.contactList.contactListId}">${publicEmailContactList.contactListType.description?if_exists} - ${publicEmailContactList.contactList.contactListName?if_exists}</option>
</#list>
</select>
</#macro>
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/custsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/custsettings.ftl?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/custsettings.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/custsettings.ftl Tue Sep 20 17:46:13 2011
@@ -39,19 +39,19 @@ under the License.
</select>
</span>
<span>
- <lable for="firstName">${uiLabelMap.PartyFirstName}</label>
+ <label for="firstName">${uiLabelMap.PartyFirstName}</label>
<input type="text" name="firstName" value="${parameters.firstName?if_exists}" /> *
</span>
<span>
- <lable for="middleName">${uiLabelMap.PartyMiddleInitial}</label>
+ <label for="middleName">${uiLabelMap.PartyMiddleInitial}</label>
<input type="text" name="middleName" value="${parameters.middleName?if_exists}" />
</span>
<span>
- <lable for="lastName">${uiLabelMap.PartyLastName}</label>
+ <label for="lastName">${uiLabelMap.PartyLastName}</label>
<input type="text" name="lastName" value="${parameters.lastName?if_exists}" /> *
</span>
<span>
- <lable for="suffix">${uiLabelMap.PartySuffix}</label>
+ <label for="suffix">${uiLabelMap.PartySuffix}</label>
<input type="text" class='inputBox' name="suffix" value="${parameters.suffix?if_exists}" />
</span>
</div>
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/optionsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/optionsettings.ftl?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/optionsettings.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/order/optionsettings.ftl Tue Sep 20 17:46:13 2011
@@ -26,7 +26,7 @@ under the License.
<li>
<#assign shippingMethod = carrierShipmentMethod.shipmentMethodTypeId + "@" + carrierShipmentMethod.partyId>
<input type="radio" id="shipping_method_${shippingMethod}" name="shipping_method" value="${shippingMethod}" <#if shippingMethod == chosenShippingMethod?default("N@A")>checked="checked"</#if>/>
- <lable for="shipping_method_${shippingMethod}">
+ <label for="shipping_method_${shippingMethod}">
<#if shoppingCart.getShippingContactMechId()?exists>
<#assign shippingEst = shippingEstWpr.getShippingEstimate(carrierShipmentMethod)?default(-1)>
</#if>
@@ -74,7 +74,7 @@ under the License.
<label far="is_gift_N">${uiLabelMap.CommonNo}</label>
</div>
<div>
- <lable for="gift_message">${uiLabelMap.OrderGiftMessage}</label>
+ <label for="gift_message">${uiLabelMap.OrderGiftMessage}</label>
<textarea class="textAreaBox" name="gift_message">${shoppingCart.getGiftMessage()?if_exists}</textarea>
</div>
</fieldset>
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl Tue Sep 20 17:46:13 2011
@@ -20,12 +20,15 @@ under the License.
<script type="text/javascript">
<!-- function to add extra info for Timestamp format -->
function TimestampSubmit(obj) {
- if (obj.elements["reservStartStr"].value.length == 10) {
- obj.elements["reservStart"].value = obj.elements["reservStartStr"].value + " 00:00:00.000000000";
+ reservStartStr = jQuery(obj).find("input[name='reservStartStr']");
+ val1 = reservStartStr.val();
+ reservStart = jQuery(obj).find("input[name='reservStart']");
+ if (reservStartStr.val().length == 10) {
+ reservStart.val(reservStartStr.val() + " 00:00:00.000000000");
} else {
- obj.elements["reservStart"].value = obj.elements["reservStartStr"].value;
+ reservStart.val(reservStartStr.val());
}
- obj.submit();
+ jQuery(obj).submit();
}
</script>
<br />
@@ -403,8 +406,31 @@ under the License.
<input type="hidden" name="shoppingListItemSeqId" value="${shoppingListItem.shoppingListItemSeqId}"/>
<input type="hidden" name="reservStart"/>
<div class="tabletext">
- <#if product.productTypeId == "ASSET_USAGE"><table border="0" width="100%"><tr><td width="1%"> </td><td><input type="text" class="inputBox" size="10" name="reservStartStr" value="${shoppingListItem.reservStart?if_exists}"/></td><td><input type="text" class="inputBox" size="2" name="reservLength" value="${shoppingListItem.reservLength?if_exists}"/></td></tr><tr><td> </td><td><input type="text" class="inputBox" size="3" name="reservPersons" value="${shoppingListItem.reservPersons?if_exists}"/></td><td class="tabletext"><#else>
- <table width="100%"><tr><td width="62%" align="center">--</td><td align="center">--</td></tr><tr><td align="center">--</td><td class="tabletext"><input type="hidden" name="reservStartStr" value=""/>
+ <#if product.productTypeId == "ASSET_USAGE" || product.productTypeId == "ASSET_USAGE_OUT_IN">
+ <table border="0" width="100%">
+ <tr>
+ <td width="1%"> </td>
+ <td><@htmlTemplate.renderDateTimeField event="" action="" name="reservStartStr" className="inputBox" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${shoppingListItem.reservStart?if_exists}" size="15" maxlength="30" id="reservStartStr_${shoppingListItem.shoppingListItemSeqId}" dateType="date" shortDateInput=true timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/></td>
+ <td><input type="text" class="inputBox" size="2" name="reservLength" value="${shoppingListItem.reservLength?if_exists}"/></td>
+ </tr>
+ <tr>
+ <#if product.productTypeId == "ASSET_USAGE">
+ <td> </td>
+ <td><input type="text" class="inputBox" size="3" name="reservPersons" value="${shoppingListItem.reservPersons?if_exists}"/></td>
+ <#else>
+ <td> </td>
+ <td> </td>
+ </#if>
+ <td class="tabletext">
+ <#else>
+ <table width="100%">
+ <tr>
+ <td width="62%" align="center">--</td>
+ <td align="center">--</td>
+ </tr>
+ <tr>
+ <td align="center">--</td>
+ <td class="tabletext"><input type="hidden" name="reservStartStr" value=""/>
</#if>
<input size="6" class="inputBox" type="text" name="quantity" value="${shoppingListItem.quantity?string.number}"/>
</td></tr></table>
@@ -423,7 +449,7 @@ under the License.
<div class="tabletext"><@ofbizCurrency amount=totalPrice isoCode=currencyUomId/></div>
</td>
<td align="right">
- <a href="javascript:TimestampSubmit(listform_${shoppingListItem.shoppingListItemSeqId});" class="buttontext">${uiLabelMap.CommonUpdate}</a>
+ <a href="#" onclick="javascript:TimestampSubmit(listform_${shoppingListItem.shoppingListItemSeqId});" class="buttontext">${uiLabelMap.CommonUpdate}</a>
<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRemove}</a>
<#if isVirtual && productVariantAssocs?has_content>
<#assign replaceItemAction = "/replaceShoppingListItem/" + requestAttributes._CURRENT_VIEW_?if_exists>
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CommonScreens.xml?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CommonScreens.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/CommonScreens.xml Tue Sep 20 17:46:13 2011
@@ -40,9 +40,12 @@ under the License.
<!-- The default (main) java scripts -->
<!-- NOTE: this should be included on each screen that uses it to avoid including it in all screens: -->
<set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/>
-
+
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.3.min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.8.13.custom.min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/ui/jquery.ui.datepicker.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.6.1.min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.6.2.min.js" global="true"/>
<script location="component://ecommerce/widget/EcommerceSetup.groovy"/>
@@ -256,7 +259,7 @@ under the License.
<set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.6.1.min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.6.2.min.js" global="true"/>
<script location="component://ecommerce/widget/EcommerceSetup.groovy"/>
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/ForumScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/ForumScreens.xml?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/ForumScreens.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ecommerce/widget/ForumScreens.xml Tue Sep 20 17:46:13 2011
@@ -126,14 +126,13 @@ under the License.
<!-- service service-name="getContentAndDataResource" result-map="contentData">
<field-map field-name="contentId" from-field="parameters.responseContentId"/>
</service -->
- <set field="contentText" from-field="electronicText.textData"/>
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<label style="blogheader">${uiLabelMap.EcommerceBlogFullMessage}:</label>
<container style="blogcontentwrapper">
- <label>${contentText}</label>
+ <content content-id="${parameters.responseContentId}"/>
</container>
<section>
<condition>
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/webapp/googlebase/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/webapp/googlebase/WEB-INF/web.xml?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/webapp/googlebase/WEB-INF/web.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/googlebase/webapp/googlebase/WEB-INF/web.xml Tue Sep 20 17:46:13 2011
@@ -24,11 +24,6 @@ under the License.
<description>Google Base component of the Open For Business Project</description>
<context-param>
- <param-name>webSiteId</param-name>
- <param-value>GOOGLEBASE</param-value>
- <description>A unique ID used to look up the WebSite entity</description>
- </context-param>
- <context-param>
<param-name>entityDelegatorName</param-name>
<param-value>default</param-value>
<description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
Propchange: ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 20 17:46:13 2011
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-952957
/ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:952958-1044489
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:962442-1156267
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:962442-1173263
Propchange: ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 20 17:46:13 2011
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-952957
/ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:952958-1044489
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:962442-1156267
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:962442-1173263
Propchange: ofbiz/branches/jackrabbit20100709/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 20 17:46:13 2011
@@ -2,4 +2,4 @@
/ofbiz/branches/dojo1.4/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-952957
/ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:952958-1044489
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:962442-1156267
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:962442-1173263
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/myportal/data/MyPortalTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/myportal/data/MyPortalTypeData.xml?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/myportal/data/MyPortalTypeData.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/myportal/data/MyPortalTypeData.xml Tue Sep 20 17:46:13 2011
@@ -155,8 +155,6 @@
<PortletPortletCategory portalPortletId="ListCustomerProjects" portletCategoryId="LIST_CUSTOMER"/>
<PortletPortletCategory portalPortletId="ListCustomerInvoices" portletCategoryId="LIST_CUSTOMER"/>
- <WebSite webSiteId="MYPORTAL" siteName="My Portal" visualThemeSetId="BACKOFFICE"/>
-
<!-- Myportal help pages -->
<DataResource dataResourceId="HELP_MYPORTAL" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="specialpurpose/myportal/data/helpdata/HELP_MYPORTAL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS"
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/myportal/webapp/myportal/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/myportal/webapp/myportal/WEB-INF/web.xml?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/myportal/webapp/myportal/WEB-INF/web.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/myportal/webapp/myportal/WEB-INF/web.xml Tue Sep 20 17:46:13 2011
@@ -24,11 +24,6 @@
<description>My Portal component of the Open For Business Project</description>
<context-param>
- <param-name>webSiteId</param-name>
- <param-value>MYPORTAL</param-value>
- <description>A unique ID used to look up the WebSite entity</description>
- </context-param>
- <context-param>
<param-name>entityDelegatorName</param-name>
<param-value>default</param-value>
<description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/ofbizwebsite/template/HtmlHead.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/ofbizwebsite/template/HtmlHead.ftl?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/ofbizwebsite/template/HtmlHead.ftl (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/ofbizwebsite/template/HtmlHead.ftl Tue Sep 20 17:46:13 2011
@@ -22,13 +22,13 @@ under the License.
<#assign initialLocale = locale.toString()>
<#else>
<#assign initialLocale = "en">
-</#if>
+</#if>
<head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/>
<title>${(uiLabelMap.OfbizTitle)!"OFBiz, The Apache Open For Business Project"}</title>
<link rel="shortcut icon" href="/ofbiz/images/favicon.ico">
- <script language="javascript" src="/images/jquery/jquery-1.6.1.min.js" type="text/javascript"></script>
+ <script language="javascript" src="/images/jquery/jquery-1.6.2.min.js" type="text/javascript"></script>
<script language="javascript" src="/images/fieldlookup.js" type="text/javascript"></script>
<script language="javascript" src="/images/selectall.js" type="text/javascript"></script>
<script language="javascript" src="/ofbiz/script/search.js" type="text/javascript"></script>
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java Tue Sep 20 17:46:13 2011
@@ -1188,7 +1188,7 @@ public class PosTransaction implements S
public void loadSale(PosScreen pos) {
trace("Load a sale");
List<GenericValue> shoppingLists = createShoppingLists();
- if (!shoppingLists.isEmpty()) {
+ if (UtilValidate.isNotEmpty(shoppingLists)) {
Map<String, String> salesMap = createSalesMap(shoppingLists);
if (!salesMap.isEmpty()) {
LoadSale loadSale = new LoadSale(salesMap, this, pos);
@@ -1204,7 +1204,7 @@ public class PosTransaction implements S
public void loadOrder(PosScreen pos) {
List<GenericValue> orders = findOrders();
- if (!orders.isEmpty()) {
+ if (UtilValidate.isNotEmpty(orders)) {
LoadSale loadSale = new LoadSale(createOrderHash(orders), this, pos);
loadSale.openDlg();
} else {
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java Tue Sep 20 17:46:13 2011
@@ -32,6 +32,7 @@ import net.xoetrope.xui.style.XStyle;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilProperties;
+import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.pos.PosTransaction;
import org.ofbiz.pos.screen.PosScreen;
@@ -135,7 +136,7 @@ public class Journal {
PosTransaction tx = PosTransaction.getCurrentTx(pos.getSession());
XModel jmodel = this.createModel();
- if (tx != null && !tx.isEmpty()) {
+ if (UtilValidate.isNotEmpty(tx)) {
tx.appendItemDataModel(jmodel);
this.appendEmpty(jmodel);
tx.appendTotalDataModel(jmodel);
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml Tue Sep 20 17:46:13 2011
@@ -1332,7 +1332,7 @@
</property>
<property key="ProjectMgrProrityAbbr">
<value xml:lang="en">Prio.</value>
- <value xml:lang="en">P.</value>
+ <value xml:lang="fr">P.</value>
</property>
<property key="ProjectMgrPrivateOrPublic">
<value xml:lang="de">Privat/Ãffentlich</value>
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/data/ProjectMgrTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/data/ProjectMgrTypeData.xml?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/data/ProjectMgrTypeData.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/data/ProjectMgrTypeData.xml Tue Sep 20 17:46:13 2011
@@ -76,6 +76,4 @@ under the License.
<!-- for current installations -->
<StatusValidChange condition="" statusId="_NA_" statusIdTo="PRJ_CLOSED" transitionName="Close project"/>
- <WebSite webSiteId="PROJECTMGR" siteName="Project Manager" visualThemeSetId="BACKOFFICE"/>
-
</entity-engine-xml>
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/web.xml?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/web.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/web.xml Tue Sep 20 17:46:13 2011
@@ -24,11 +24,6 @@
<description>Project Management component of the Open For Business Project</description>
<context-param>
- <param-name>webSiteId</param-name>
- <param-value>PROJECTMGR</param-value>
- <description>A unique ID used to look up the WebSite entity</description>
- </context-param>
- <context-param>
<param-name>entityDelegatorName</param-name>
<param-value>default</param-value>
<description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/projectmgr/widget/forms/TaskForms.xml Tue Sep 20 17:46:13 2011
@@ -549,7 +549,7 @@
</field>
<field name="taskDescription" title="${uiLabelMap.CommonDescription}"><display/></field>
<field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
- <field name="priority" title="${uiLabelMap.CommonPriority}"><display type="date"/></field>
+ <field name="priority" title="${uiLabelMap.CommonPriority}"><display/></field>
<field name="estimatedStartDate"><display type="date"/></field>
<field name="estimatedCompletionDate"><display type="date"/></field>
<field name="actualStartDate"><display type="date"/></field>
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/config/scrumUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/config/scrumUiLabels.xml?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/config/scrumUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/config/scrumUiLabels.xml Tue Sep 20 17:46:13 2011
@@ -29,9 +29,6 @@
<value xml:lang="nl">Alle gerapporteerde/goedgekeurde uren toevoegen aan nieuwe faktuur</value>
<value xml:lang="zh">æå
¨é¨å·²æ¥å/å·²æ¹åçä»»å¡æ¶é´æ·»å å°ä¸ä¸ªæ°çå票</value>
</property>
- <property key="PageTitleAddPublicHoliday">
- <value xml:lang="en">Add Public Holiday</value>
- </property>
<property key="PageTitleAddSprint">
<value xml:lang="en">Add Sprint</value>
</property>
@@ -206,12 +203,6 @@
<property key="PageTitleProjectAndSprintList">
<value xml:lang="en">Project and Sprint List</value>
</property>
- <property key="PageTitlePublicHoliday">
- <value xml:lang="en">Public Holiday</value>
- </property>
- <property key="PageTitlePublicHolidayList">
- <value xml:lang="en">Public Holiday List</value>
- </property>
<property key="PageTitleScrumDefaultTasks">
<value xml:lang="en">Scrum Default Tasks</value>
</property>
@@ -612,9 +603,6 @@
<value xml:lang="nl">Vr</value>
<value xml:lang="zh">å¨äº</value>
</property>
- <property key="ScrumHolidayName">
- <value xml:lang="en">Holiday Name</value>
- </property>
<property key="ScrumHowToTest">
<value xml:lang="en">How to test</value>
</property>
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/scrumHelpData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/scrumHelpData.xml?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/scrumHelpData.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/scrumHelpData.xml Tue Sep 20 17:46:13 2011
@@ -24,170 +24,170 @@
dataResourceName="SCRUM Help system root" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="HELP_SCRUM" contentTypeId="DOCUMENT" templateDataResourceId="HELP_TEMPL"
dataResourceId="HELP_SCRUM" localeString="en" statusId="CTNT_IN_PROGRESS" contentName="Scrum" mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_SCRUM" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" mapKey="scrumSite_Sprints"/>
+ <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_SCRUM" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" mapKey="SCRUM_Sprints"/>
<!-- === Project === -->
<DataResource dataResourceId="HELP_SCRUM_PROJECT" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_Project.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Project" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="HELP_SCRUM_PROJECT" contentTypeId="DOCUMENT" contentName="Project" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_SCRUM_PROJECT" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP_SCRUM" contentIdTo="HELP_SCRUM_PROJECT" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_viewScrumProject"/>
+ <ContentAssoc contentId="HELP_SCRUM" contentIdTo="HELP_SCRUM_PROJECT" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_viewScrumProject"/>
<DataResource dataResourceId="HELP_SCRUM_PRODUCT" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_ProductView.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Product" mimeTypeId="text/xml" isPublic="Y"/>
<Content contentId="HELP_SCRUM_PRODUCT" contentTypeId="DOCUMENT" contentName="Product" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_SCRUM_PRODUCT" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP_SCRUM" contentIdTo="HELP_SCRUM_PRODUCT" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_main"/>
+ <ContentAssoc contentId="HELP_SCRUM" contentIdTo="HELP_SCRUM_PRODUCT" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_main"/>
<DataResource dataResourceId="SCRUM_CreteScrProj" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_CreateScrumProject.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Create Scrum Project Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="SCRUM_CreteScrProj" contentTypeId="DOCUMENT" contentName="Create Scrum Project Help" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_CreteScrProj" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP_SCRUM_PROJECT" contentIdTo="SCRUM_CreteScrProj" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_editScrumProject"/>
+ <ContentAssoc contentId="HELP_SCRUM_PROJECT" contentIdTo="SCRUM_CreteScrProj" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_editScrumProject"/>
<DataResource dataResourceId="SCRUM_AddProdBacklog" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_AddProdBacklog.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Create Scrum Product Backlog Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="SCRUM_AddProdBacklog" contentTypeId="DOCUMENT" contentName="Create Scrum Product Backlog Help" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_AddProdBacklog" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_AddProdBacklog" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_AddProdBacklog"/>
+ <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_AddProdBacklog" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_AddProdBacklog"/>
<DataResource dataResourceId="SCRUM_EditProduct" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_AddProdBacklog.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Scrum Product Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="SCRUM_EditProduct" contentTypeId="DOCUMENT" contentName="Create Scrum Product Backlog Help" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_AddProdBacklog" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_EditProduct" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_EditProduct"/>
+ <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_EditProduct" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_EditProduct"/>
<DataResource dataResourceId="SCRUM_EditProBacklog" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditProdBacklog.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Create Scrum Product Backlog Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="SCRUM_EditProBacklog" contentTypeId="DOCUMENT" contentName="Edit Scrum Product Backlog Help" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_EditProBacklog" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_EditProBacklog" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_EditProdBacklog"/>
+ <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_EditProBacklog" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_EditProdBacklog"/>
<DataResource dataResourceId="SCRUM_EDIT_SPB" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditSprintBacklog.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Sprint Backlog Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="SCRUM_EDIT_SPB" contentTypeId="DOCUMENT" contentName="Edit Sprint Backlog Help" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_EDIT_SPB" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP_SCRUM_PROJECT" contentIdTo="SCRUM_EDIT_SPB" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_EditSprintBacklog"/>
+ <ContentAssoc contentId="HELP_SCRUM_PROJECT" contentIdTo="SCRUM_EDIT_SPB" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_EditSprintBacklog"/>
<DataResource dataResourceId="SCRUM_EditSprint" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditSprint.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Sprint" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="SCRUM_EditSprint" contentTypeId="DOCUMENT" contentName="Edit Sprint" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_EditSprint" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP_SCRUM_PROJECT" contentIdTo="SCRUM_EditSprint" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_EditSprint"/>
+ <ContentAssoc contentId="HELP_SCRUM_PROJECT" contentIdTo="SCRUM_EditSprint" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_EditSprint"/>
<DataResource dataResourceId="SCRUM_AddSprintBL" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_AddSprintBacklog.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Add Sprint Backlog Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="SCRUM_AddSprintBL" contentTypeId="DOCUMENT" contentName="Add Sprint Backlog Help" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_AddSprintBL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP_SCRUM" contentIdTo="SCRUM_AddSprintBL" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_AddSprintBacklog"/>
+ <ContentAssoc contentId="HELP_SCRUM" contentIdTo="SCRUM_AddSprintBL" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_AddSprintBacklog"/>
<DataResource dataResourceId="SCRUM_AddSprint" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_AddSprint.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Add Sprint Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="SCRUM_AddSprint" contentTypeId="DOCUMENT" contentName="Add Sprint Help" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_AddSprint" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP_SCRUM" contentIdTo="SCRUM_AddSprint" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_AddSprint"/>
+ <ContentAssoc contentId="HELP_SCRUM" contentIdTo="SCRUM_AddSprint" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_AddSprint"/>
<DataResource dataResourceId="SCRUM_AddProduct" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_AddProduct.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Create Scrum Product Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="SCRUM_AddProduct" contentTypeId="DOCUMENT" contentName="Create Scrum Product Help" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_AddProduct" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_AddProduct" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_AddProduct"/>
+ <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_AddProduct" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_AddProduct"/>
<DataResource dataResourceId="SCRUM_SprintList" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_SprintList.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Sprint List Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="SCRUM_SprintList" contentTypeId="DOCUMENT" contentName="Sprint List Help" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_SprintList" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP_SCRUM" contentIdTo="SCRUM_SprintList" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_SprintList"/>
+ <ContentAssoc contentId="HELP_SCRUM" contentIdTo="SCRUM_SprintList" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_SprintList"/>
<DataResource dataResourceId="SCRUM_ViewSprint" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_ViewSprint.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Sprint View Help" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="SCRUM_ViewSprint" contentTypeId="DOCUMENT" contentName="Sprint View Help" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_ViewSprint" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP_SCRUM" contentIdTo="SCRUM_ViewSprint" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_ViewSprint"/>
+ <ContentAssoc contentId="HELP_SCRUM" contentIdTo="SCRUM_ViewSprint" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_ViewSprint"/>
<DataResource dataResourceId="SCRUM_OpenTest" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_OpenTest.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Open Test" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="SCRUM_OpenTest" contentTypeId="DOCUMENT" contentName="Open Test" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_OpenTest" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP_SCRUM" contentIdTo="SCRUM_OpenTest" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_openTest"/>
+ <ContentAssoc contentId="HELP_SCRUM" contentIdTo="SCRUM_OpenTest" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_openTest"/>
<DataResource dataResourceId="SCRUM_TaskView" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_TaskView.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="View Task" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="SCRUM_TaskView" contentTypeId="DOCUMENT" contentName="View Task" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_TaskView" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP_SCRUM" contentIdTo="SCRUM_TaskView" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_taskView"/>
+ <ContentAssoc contentId="HELP_SCRUM" contentIdTo="SCRUM_TaskView" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_taskView"/>
<DataResource dataResourceId="SCRUM_FindResource" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_FindResource.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Member" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="SCRUM_FindResource" contentTypeId="DOCUMENT" contentName="Member" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_FindResource" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP_SCRUM" contentIdTo="SCRUM_FindResource" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_FindResource"/>
+ <ContentAssoc contentId="HELP_SCRUM" contentIdTo="SCRUM_FindResource" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_FindResource"/>
<DataResource dataResourceId="SCRUM_MyWork" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_MyWork.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MyWork" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="SCRUM_MyWork" contentTypeId="DOCUMENT" contentName="MyWork" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_MyWork" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP_SCRUM" contentIdTo="SCRUM_MyWork" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_MyWork"/>
+ <ContentAssoc contentId="HELP_SCRUM" contentIdTo="SCRUM_MyWork" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_MyWork"/>
<DataResource dataResourceId="SCRUM_FindTimeSheet" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_FindTimeSheet.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="TimeSheet" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="SCRUM_FindTimeSheet" contentTypeId="DOCUMENT" contentName="TimeSheet" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_FindTimeSheet" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP_SCRUM" contentIdTo="SCRUM_FindTimeSheet" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_FindTimeSheet"/>
+ <ContentAssoc contentId="HELP_SCRUM" contentIdTo="SCRUM_FindTimeSheet" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_FindTimeSheet"/>
<DataResource dataResourceId="SCRUM_ViewProduct" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_ViewProduct.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Product Overview" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="SCRUM_ViewProduct" contentTypeId="DOCUMENT" contentName="Product Overview" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_ViewProduct" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_ViewProduct" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_ViewProduct"/>
+ <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_ViewProduct" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_ViewProduct"/>
<DataResource dataResourceId="SCRUM_defaultTasks" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_defaultTasks.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Default Tasks" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="SCRUM_defaultTasks" contentTypeId="DOCUMENT" contentName="Default Tasks" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_defaultTasks" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_defaultTasks" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_defaultTasks"/>
+ <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_defaultTasks" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_defaultTasks"/>
<DataResource dataResourceId="SCRUM_editDefTask" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_defaultTasks.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Default Task" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="SCRUM_editDefTask" contentTypeId="DOCUMENT" contentName="Edit Default Task" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_editDefTask" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_editDefTask" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_editDefaultTask"/>
+ <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_editDefTask" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_editDefaultTask"/>
<DataResource dataResourceId="SCRUM_ListBackCate" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_ListProductBacklogCategories.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="List Product Backlog Categories" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="SCRUM_ListBackCate" contentTypeId="DOCUMENT" contentName="List Product Backlog Categories" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_ListBackCate" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_ListBackCate" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_ListProductBacklogCategories"/>
+ <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_ListBackCate" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_ListProductBacklogCategories"/>
<DataResource dataResourceId="SCRUM_EditBackCate" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_ListProductBacklogCategories.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Product Backlog Categories" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="SCRUM_EditBackCate" contentTypeId="DOCUMENT" contentName="Edit Product Backlog Categories" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_EditBackCate" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_EditBackCate" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_EditProductBacklogCategory"/>
+ <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_EditBackCate" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_EditProductBacklogCategory"/>
<DataResource dataResourceId="SCRUM_EditProContent" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditProductContents.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Product Contents" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="SCRUM_EditProContent" contentTypeId="DOCUMENT" contentName="Edit Product Contents" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_EditProContent" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_EditProContent" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_EditProductContents"/>
+ <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_EditProContent" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_EditProductContents"/>
<DataResource dataResourceId="SCRUM_ProductEmails" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_ProductEmails.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Communication Product Emails" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="SCRUM_ProductEmails" contentTypeId="DOCUMENT" contentName="Communication Product Emails" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_ProductEmails" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_ProductEmails" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_ProductEmails"/>
+ <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_ProductEmails" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_ProductEmails"/>
<DataResource dataResourceId="SCRUM_NewProEmail" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_NewProductEmail.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="New Emails" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="SCRUM_NewProEmail" contentTypeId="DOCUMENT" contentName="New Emails" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_NewProEmail" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_NewProEmail" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_NewProductEmail"/>
+ <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_NewProEmail" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_NewProductEmail"/>
<DataResource dataResourceId="SCRUM_EditProjCon" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditProjectContents.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Product Content" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="SCRUM_EditProjCon" contentTypeId="DOCUMENT" contentName="Edit Product Content" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_EditProjCon" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP_SCRUM_PROJECT" contentIdTo="SCRUM_EditProjCon" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_EditProjectContents"/>
+ <ContentAssoc contentId="HELP_SCRUM_PROJECT" contentIdTo="SCRUM_EditProjCon" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_EditProjectContents"/>
<DataResource dataResourceId="SCRUM_EditBkItemCon" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditBacklogItemContent.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Product Item Content" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="SCRUM_EditBkItemCon" contentTypeId="DOCUMENT" contentName="Edit Product Item Content" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_EditBkItemCon" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_EditBkItemCon" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_EditBacklogItemContent"/>
+ <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_EditBkItemCon" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_EditBacklogItemContent"/>
<DataResource dataResourceId="SCRUM_ViewBkItem" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_ViewProdBacklogItem.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="View Product Backlog Item" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="SCRUM_ViewBkItem" contentTypeId="DOCUMENT" contentName="View Product Backlog Item" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_ViewBkItem" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_ViewBkItem" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_ViewProdBacklogItem"/>
+ <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_ViewBkItem" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_ViewProdBacklogItem"/>
<DataResource dataResourceId="SCRUM_ViewBkItem" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_ViewProdBacklogItem.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="View Product Backlog Item" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="SCRUM_ViewBkItem" contentTypeId="DOCUMENT" contentName="View Product Backlog Item" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_ViewBkItem" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_ViewBkItem" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_ViewProdBacklogItem"/>
+ <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_ViewBkItem" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_ViewProdBacklogItem"/>
<DataResource dataResourceId="SCRUM_ProdBKEmail" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_ProductBacklogEmails.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Product Backlog Communications" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="SCRUM_ProdBKEmail" contentTypeId="DOCUMENT" contentName="Product Backlog Communications" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_ProdBKEmail" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_ProdBKEmail" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_ProductBacklogEmails"/>
+ <ContentAssoc contentId="HELP_SCRUM_PRODUCT" contentIdTo="SCRUM_ProdBKEmail" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_ProductBacklogEmails"/>
<DataResource dataResourceId="SCRUM_SprintMember" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_SprintMember.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Sprint Member" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="SCRUM_SprintMember" contentTypeId="DOCUMENT" contentName="Sprint Member" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_SprintMember" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP_SCRUM_PROJECT" contentIdTo="SCRUM_SprintMember" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_SprintMember"/>
+ <ContentAssoc contentId="HELP_SCRUM_PROJECT" contentIdTo="SCRUM_SprintMember" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_SprintMember"/>
<DataResource dataResourceId="SCRUM_Minute" localeString="en" dataResourceTypeId="OFBIZ_FILE"
objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM_DailyScrumMeetingMinute.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Daily Scrum Meeting Minute" mimeTypeId="text/xml" isPublic="Y" />
<Content contentId="SCRUM_Minute" contentTypeId="DOCUMENT" contentName="Daily Scrum Meeting Minute" templateDataResourceId="HELP_TEMPL" dataResourceId="SCRUM_Minute" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>
- <ContentAssoc contentId="HELP_SCRUM_PROJECT" contentIdTo="SCRUM_Minute" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="scrumSite_DailyScrumMeetingMinute"/>
+ <ContentAssoc contentId="HELP_SCRUM_PROJECT" contentIdTo="SCRUM_Minute" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" sequenceNum="000" mapKey="SCRUM_DailyScrumMeetingMinute"/>
</entity-engine-xml>
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/scrumTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/scrumTypeData.xml?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/scrumTypeData.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/scrumTypeData.xml Tue Sep 20 17:46:13 2011
@@ -15,7 +15,7 @@
<WorkEffortType workEffortTypeId="SCRUM_TASK_IMPL" parentTypeId="SCRUM_TASK" description="Implementation" hasTable="N"/>
<WorkEffortType workEffortTypeId="SCRUM_TASK_INST" parentTypeId="SCRUM_TASK" description="Installation" hasTable="N"/>
<WorkEffortType workEffortTypeId="SCRUM_TASK_TEST" parentTypeId="SCRUM_TASK" description="Test" hasTable="N"/>
- <WorkEffortType workEffortTypeId="SCRUM_HOLIDAY" description="Public Holiday" hasTable="N"/> <!-- Public Holiday -->
+
<WorkEffortPurposeType workEffortPurposeTypeId="SCRUM_DEFAULT_TASK" description="Default Task"/>
<WorkEffortPurposeType workEffortPurposeTypeId="SYSTEM_DEFAULT_TASK" description="System Default Task"/>
<CustRequestType custRequestTypeId="RF_PROD_BACKLOG" hasTable="N" description="Request For Product Backlog Items"/>
@@ -80,8 +80,6 @@
<!-- Party SVN Identification-->
<PartyIdentificationType partyIdentificationTypeId="SVN_LOGIN" description="SVN login name"/>
- <WebSite webSiteId="scrumSite" siteName="Scrum Manager" visualThemeSetId="BACKOFFICE"/>
-
<StatusValidChange statusId="CRQ_REVIEWED" statusIdTo="CRQ_ACCEPTED" transitionName="Accept Request"/>
<StatusValidChange statusId="CRQ_CANCELLED" statusIdTo="CRQ_ACCEPTED" transitionName="Re-open Request"/>
<StatusValidChange statusId="CRQ_COMPLETED" statusIdTo="CRQ_REOPENED" transitionName="Re-open Request"/>
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumEvents.xml?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumEvents.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumEvents.xml Tue Sep 20 17:46:13 2011
@@ -4362,29 +4362,6 @@
<entity-one value-field="productRoleMap" entity-name="ProductRole"/>
<remove-value value-field="productRoleMap"/>
</simple-method>
- <simple-method method-name="createPublicHoliday" short-description="Create Public Holiday">
- <if-empty field="parameters.estimatedStartDate">
- <add-error>
- <fail-message message="The FromDate is missing"/>
- </add-error>
- <check-errors/>
- </if-empty>
- <entity-and list="workEffortList" entity-name="WorkEffort">
- <field-map field-name="workEffortTypeId" value="SCRUM_HOLIDAY"/>
- <field-map field-name="estimatedStartDate" from-field="parameters.estimatedStartDate"/>
- </entity-and>
- <if-empty field="workEffortList">
- <call-service service-name="createWorkEffortAndPartyAssign" in-map-name="parameters">
- <default-message>Successfully created.</default-message>
- </call-service>
- <else>
- <add-error>
- <fail-message message="This FromDate : ${parameters.estimatedStartDate} already exist."/>
- </add-error>
- <check-errors/>
- </else>
- </if-empty>
- </simple-method>
<simple-method method-name="updateNotBilledBacklog" short-description="Update Not Billed Backlog">
<call-class-method method-name="getParameterMap" class-name="org.ofbiz.base.util.UtilHttp" ret-field="paramMap">
<field field="request" type="javax.servlet.http.HttpServletRequest"/>
@@ -4402,9 +4379,11 @@
</simple-method>
<simple-method method-name="getWebSiteId" short-description="Get WebSite Id">
<!-- for notification -->
- <call-class-method method-name="getWebSiteId" class-name="org.ofbiz.webapp.website.WebSiteWorker" ret-field="webSiteId">
- <field field="request" type="javax.servlet.ServletRequest"/>
- </call-class-method>
+ <if-not-empty field="request">
+ <call-class-method method-name="getWebSiteId" class-name="org.ofbiz.webapp.website.WebSiteWorker" ret-field="webSiteId">
+ <field field="request" type="javax.servlet.ServletRequest"/>
+ </call-class-method>
+ </if-not-empty>
<if-not-empty field="webSiteId">
<set field="parameters.webSiteId" from-field="webSiteId"/>
</if-not-empty>
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/demotest/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/demotest/WEB-INF/web.xml?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/demotest/WEB-INF/web.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/demotest/WEB-INF/web.xml Tue Sep 20 17:46:13 2011
@@ -5,12 +5,6 @@
</description>
<context-param>
- <param-name>webSiteId</param-name>
- <param-value>scrumSite</param-value>
- <description>A unique ID used to look up the WebSite entity
- </description>
- </context-param>
- <context-param>
<param-name>localDispatcherName</param-name>
<param-value>scrum</param-value>
<description>A unique name used to identify/recognize the local
Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/WEB-INF/controller.xml?rev=1173274&r1=1173273&r2=1173274&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/WEB-INF/controller.xml (original)
+++ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/webapp/scrum/WEB-INF/controller.xml Tue Sep 20 17:46:13 2011
@@ -25,11 +25,6 @@
<event name="timeSheetChecker" type="java" path="org.ofbiz.scrum.ScrumEvents" invoke="timeSheetChecker"/>
</after-login>
- <request-map uri="logout">
- <security https="false" auth="true"/>
- <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="logout"/>
- <response name="success" type="request-redirect" value="../../scrumdemo"/>
- </request-map>
<!-- Request Mappings -->
<request-map uri="main">
<security https="true" auth="true"/>
@@ -1238,29 +1233,6 @@
<response name="success" type="request-redirect-noparam" value="FindResource"/>
<response name="error" type="view" value="FindResource"/>
</request-map>
- <request-map uri="PublicHoliday">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="PublicHoliday"/>
- <response name="error" type="view" value="PublicHoliday"/>
- </request-map>
- <request-map uri="createPublicHoliday">
- <security https="true" auth="true"/>
- <event type="simple" invoke="createPublicHoliday" path="component://scrum/script/org/ofbiz/scrum/ScrumEvents.xml"/>
- <response name="success" type="request-redirect-noparam" value="PublicHoliday"/>
- <response name="error" type="view-last"/>
- </request-map>
- <request-map uri="updatePublicHoliday">
- <security https="true" auth="true"/>
- <event type="service" invoke="updateWorkEffort"/>
- <response name="success" type="request-redirect-noparam" value="PublicHoliday"/>
- <response name="error" type="view-last"/>
- </request-map>
- <request-map uri="deletePublicHoliday">
- <security https="true" auth="true"/>
- <event type="service" invoke="deleteWorkEffort"/>
- <response name="success" type="view" value="PublicHoliday"/>
- <response name="error" type="view-last"/>
- </request-map>
<!-- View Mappings -->
<view-map name="main" type="screen" page="component://scrum/widget/scrumScreens.xml#ScrumProduct"/>
@@ -1359,7 +1331,6 @@
<view-map name="quickAddPartyRelationship" type="screen" page="component://scrum/widget/ResourceScreens.xml#QuickAddPartyRelationship"/>
<view-map name="QuickAddPartyRate" type="screen" page="component://scrum/widget/ResourceScreens.xml#QuickAddPartyRate"/>
<view-map name="ProductStatistics" type="screen" page="component://scrum/widget/scrumScreens.xml#ProductStatistics"/>
- <view-map name="PublicHoliday" type="screen" page="component://scrum/widget/scrumScreens.xml#PublicHoliday"/>
<!-- Unplan Backlog -->
<view-map name="unplanBacklog" type="screen" page="component://scrum/widget/scrumScreens.xml#unplanBacklog"/>