svn commit: r1618313 [10/11] - in /ofbiz/trunk: specialpurpose/assetmaint/weba
Locked
svn commit: r1618313 [10/11] - in /ofbiz/trunk: specialpurpose/assetmaint/weba
 
|
Modified: ofbiz/trunk/specialpurpose/myportal/widget/login.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/login.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/myportal/widget/login.ftl (original) +++ ofbiz/trunk/specialpurpose/myportal/widget/login.ftl Sat Aug 16 08:40:28 2014 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<#if requestAttributes.uiLabelMap?exists><#assign uiLabelMap = requestAttributes.uiLabelMap></#if> +<#if requestAttributes.uiLabelMap??><#assign uiLabelMap = requestAttributes.uiLabelMap></#if> <#assign useMultitenant = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("general.properties", "multitenant")> <#assign username = requestParameters.USERNAME?default((sessionAttributes.autoUserLogin.userLoginId)?default(""))> @@ -43,13 +43,13 @@ under the License. <td><input type="password" name="PASSWORD" value="" size="20"/></td> </tr> <#if ("Y" == useMultitenant) > - <#if !requestAttributes.tenantId?exists> + <#if !requestAttributes.tenantId??> <tr> <td class="label">${uiLabelMap.CommonTenantId}</td> - <td><input type="text" name="tenantId" value="${parameters.tenantId?if_exists}" size="20"/></td> + <td><input type="text" name="tenantId" value="${parameters.tenantId!}" size="20"/></td> </tr> <#else> - <input type="hidden" name="tenantId" value="${requestAttributes.tenantId?if_exists}"/> + <input type="hidden" name="tenantId" value="${requestAttributes.tenantId!}"/> </#if> </#if> <tr> Modified: ofbiz/trunk/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl (original) +++ ofbiz/trunk/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl Sat Aug 16 08:40:28 2014 @@ -47,12 +47,12 @@ <#assign alt_row = false> <#list inventoryMapList as inventoryMap> <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> - <td valign="top"> ${inventoryMap.productId?if_exists}</td> - <td align="right" valign="top"> ${inventoryMap.timestamp?if_exists?if_exists}</td> - <td align="right" valign="top"> ${inventoryMap.statusId?if_exists?if_exists}</td> - <td align="center" valign="top"> ${inventoryMap.quantityOnHandTotal?if_exists?if_exists}</td> - <td align="center" valign="top"> ${inventoryMap.quantityFromMessage?if_exists?if_exists}</td> - <td align="right" valign="top"> ${inventoryMap.quantityDiff?if_exists?if_exists}</td> + <td valign="top"> ${inventoryMap.productId!}</td> + <td align="right" valign="top"> ${inventoryMap.timestamp!!}</td> + <td align="right" valign="top"> ${inventoryMap.statusId!!}</td> + <td align="center" valign="top"> ${inventoryMap.quantityOnHandTotal!!}</td> + <td align="center" valign="top"> ${inventoryMap.quantityFromMessage!!}</td> + <td align="right" valign="top"> ${inventoryMap.quantityDiff!!}</td> </tr> <#-- toggle the row color --> <#assign alt_row = !alt_row> Modified: ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ConfirmBod.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ConfirmBod.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ConfirmBod.ftl (original) +++ ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ConfirmBod.ftl Sat Aug 16 08:40:28 2014 @@ -36,28 +36,28 @@ <of:CONFIRMATION>1</of:CONFIRMATION> <of:LANGUAGE>ENG</of:LANGUAGE> <of:CODEPAGE>NONE</of:CODEPAGE> - <of:AUTHID>${authId?if_exists}</of:AUTHID> + <of:AUTHID>${authId!}</of:AUTHID> </os:SENDER> - <os:DATETIMEISO>${sentDate?if_exists}</os:DATETIMEISO> + <os:DATETIMEISO>${sentDate!}</os:DATETIMEISO> </os:CNTROLAREA> <n:DATAAREA> <n:CONFIRM_BOD> <n:CONFIRM> <os:CNTROLAREA> <os:SENDER> - <of:LOGICALID>${errorLogicalId?if_exists}</of:LOGICALID> - <of:COMPONENT>${errorComponent?if_exists}</of:COMPONENT> - <of:TASK>${errorTask?if_exists}</of:TASK> - <of:REFERENCEID>${errorReferenceId?if_exists}</of:REFERENCEID> + <of:LOGICALID>${errorLogicalId!}</of:LOGICALID> + <of:COMPONENT>${errorComponent!}</of:COMPONENT> + <of:TASK>${errorTask!}</of:TASK> + <of:REFERENCEID>${errorReferenceId!}</of:REFERENCEID> </os:SENDER> <os:DATETIMEISO></os:DATETIMEISO> </os:CNTROLAREA> - <of:ORIGREF>${origRef?if_exists}</of:ORIGREF> - <#if errorMapList?exists> + <of:ORIGREF>${origRef!}</of:ORIGREF> + <#if errorMapList??> <#list errorMapList as errorMap> <n:CONFIRMMSG> - <of:DESCRIPTN>${errorMap.description?if_exists?xml}</of:DESCRIPTN> - <of:REASONCODE>${errorMap.reasonCode?if_exists?xml}</of:REASONCODE> + <of:DESCRIPTN>${errorMap.description!?xml}</of:DESCRIPTN> + <of:REASONCODE>${errorMap.reasonCode!?xml}</of:REASONCODE> </n:CONFIRMMSG> </#list> </#if> Modified: ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl (original) +++ ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl Sat Aug 16 08:40:28 2014 @@ -49,27 +49,27 @@ under the License. <of:CONFIRMATION>1</of:CONFIRMATION> <of:LANGUAGE>ENG</of:LANGUAGE> <of:CODEPAGE>NONE</of:CODEPAGE> - <of:AUTHID>${authId?if_exists}</of:AUTHID> + <of:AUTHID>${authId!}</of:AUTHID> </os:SENDER> - <os:DATETIMEISO>${sentDate?if_exists}</os:DATETIMEISO> + <os:DATETIMEISO>${sentDate!}</os:DATETIMEISO> </os:CNTROLAREA> <n:DATAAREA> <n:PROCESS_SHIPMENT> <n:SHIPMENT> - <of:DOCUMENTID>${shipment.shipmentId?if_exists}</of:DOCUMENTID> + <of:DOCUMENTID>${shipment.shipmentId!}</of:DOCUMENTID> <#if shipperId?has_content> <of:SHIPPERID>${shipperId}</of:SHIPPERID><#-- fill in from PartyCarrierAccount.accountNumber; make sure filter by from/thru date and PartyCarrierAccount.carrierPartyId==orderItemShipGroup.carrierPartyId; get most recent fromDate --> <#-- this we will also only send if there is a SHIPPERID, normally fulfillment partner will select based on TRANSMETHD, address, weight, etc --> - <of:CARRIER>${orderItemShipGroup.carrierPartyId?if_exists}</of:CARRIER> + <of:CARRIER>${orderItemShipGroup.carrierPartyId!}</of:CARRIER> </#if> <#if shipperId?has_content> <of:FRGHTTERMS>COLLECT</of:FRGHTTERMS> <#else> <of:FRGHTTERMS>PREPAID</of:FRGHTTERMS> </#if> - <of:NOTES>${orderItemShipGroup.shippingInstructions?if_exists?xml}</of:NOTES> - <of:SHIPNOTES>${shipnotes?if_exists?xml}</of:SHIPNOTES><#-- if order was a return replacement order (associated with return), then set to RETURNLABEL otherwise leave blank --> - <of:TRANSMETHD>${orderItemShipGroup.shipmentMethodTypeId?if_exists}</of:TRANSMETHD> + <of:NOTES>${orderItemShipGroup.shippingInstructions!?xml}</of:NOTES> + <of:SHIPNOTES>${shipnotes!?xml}</of:SHIPNOTES><#-- if order was a return replacement order (associated with return), then set to RETURNLABEL otherwise leave blank --> + <of:TRANSMETHD>${orderItemShipGroup.shipmentMethodTypeId!}</of:TRANSMETHD> <os:PARTNER> <#if address?has_content> <#if (partyNameView.firstName)?has_content><#assign partyName = partyNameView.firstName/></#if> @@ -77,42 +77,42 @@ under the License. <#if (partyNameView.lastName)?has_content><#assign partyName = partyName + " " + partyNameView.lastName/></#if> <#-- NOTE: this is the to name --> - <#assign toName = (address.toName)?default(partyName)?if_exists/> - <#if (toName?length > partnerNameSize)><#assign toName = (toName?substring(0,partnerNameSize))?if_exists/></#if> - <of:NAME>${toName?if_exists?xml}</of:NAME> + <#assign toName = (address.toName)?default(partyName)!/> + <#if (toName?length > partnerNameSize)><#assign toName = (toName?substring(0,partnerNameSize))!/></#if> + <of:NAME>${toName!?xml}</of:NAME> <of:PARTNRTYPE>SHIPTO</of:PARTNRTYPE> <of:CURRENCY>USD</of:CURRENCY> <os:ADDRESS> - <#assign address1 = address.address1?if_exists/> - <#if (address1?length > partnerAddressLineSize)><#assign address1 = (address1?substring(0,partnerAddressLineSize))?if_exists/></#if> - <of:ADDRLINE>${address1?if_exists?xml}</of:ADDRLINE> - <#if address.address2?exists> - <#assign address2 = address.address2?if_exists/> - <#if (address2?length > partnerAddressLineSize)><#assign address2 = (address2?substring(0,partnerAddressLineSize))?if_exists/></#if> + <#assign address1 = address.address1!/> + <#if (address1?length > partnerAddressLineSize)><#assign address1 = (address1?substring(0,partnerAddressLineSize))!/></#if> + <of:ADDRLINE>${address1!?xml}</of:ADDRLINE> + <#if address.address2??> + <#assign address2 = address.address2!/> + <#if (address2?length > partnerAddressLineSize)><#assign address2 = (address2?substring(0,partnerAddressLineSize))!/></#if> <of:ADDRLINE>${address2?xml}</of:ADDRLINE> </#if> - <#assign city = address.city?if_exists/> - <#if (city?length > partnerAddressCitySize)><#assign city = (city?substring(0,partnerAddressCitySize))?if_exists/></#if> - <of:CITY>${city?if_exists?xml}</of:CITY> - <#assign countryGeoId = address.countryGeoId?if_exists/> - <#if (countryGeoId?length > partnerAddressCountrySize)><#assign countryGeoId = (countryGeoId?substring(0,partnerAddressCountrySize))?if_exists/></#if> - <of:COUNTRY>${countryGeoId?if_exists}</of:COUNTRY> + <#assign city = address.city!/> + <#if (city?length > partnerAddressCitySize)><#assign city = (city?substring(0,partnerAddressCitySize))!/></#if> + <of:CITY>${city!?xml}</of:CITY> + <#assign countryGeoId = address.countryGeoId!/> + <#if (countryGeoId?length > partnerAddressCountrySize)><#assign countryGeoId = (countryGeoId?substring(0,partnerAddressCountrySize))!/></#if> + <of:COUNTRY>${countryGeoId!}</of:COUNTRY> <#--<of:DESCRIPTN></of:DESCRIPTN> <of:FAX></of:FAX>--> - <of:POSTALCODE>${address.postalCode?if_exists?xml}</of:POSTALCODE> - <of:STATEPROVN>${address.stateProvinceGeoId?if_exists}</of:STATEPROVN> + <of:POSTALCODE>${address.postalCode!?xml}</of:POSTALCODE> + <of:STATEPROVN>${address.stateProvinceGeoId!}</of:STATEPROVN> <#if telecomNumber?has_content> - <of:TELEPHONE><#if telecomNumber.countryCode?has_content>${telecomNumber.countryCode?xml}-</#if>${telecomNumber.areaCode?if_exists?xml}-${telecomNumber.contactNumber?if_exists?xml}</of:TELEPHONE> + <of:TELEPHONE><#if telecomNumber.countryCode?has_content>${telecomNumber.countryCode?xml}-</#if>${telecomNumber.areaCode!?xml}-${telecomNumber.contactNumber!?xml}</of:TELEPHONE> </#if> </os:ADDRESS> <os:CONTACT> <#-- NOTE: this is the attention name --> - <#assign attnName = (address.attnName)?default(partyName)?if_exists/> - <#if (attnName?length > partnerContactNameSize)><#assign attnName = (attnName?substring(0,partnerContactNameSize))?if_exists/></#if> - <of:NAME>${attnName?if_exists?xml}</of:NAME> - <of:EMAIL>${emailString?if_exists?xml}</of:EMAIL> + <#assign attnName = (address.attnName)?default(partyName)!/> + <#if (attnName?length > partnerContactNameSize)><#assign attnName = (attnName?substring(0,partnerContactNameSize))!/></#if> + <of:NAME>${attnName!?xml}</of:NAME> + <of:EMAIL>${emailString!?xml}</of:EMAIL> <#--<of:FAX></of:FAX>--> - <of:TELEPHONE><#if telecomNumber.countryCode?has_content>${telecomNumber.countryCode?xml}-</#if>${telecomNumber.areaCode?if_exists?xml}-${telecomNumber.contactNumber?if_exists?xml}</of:TELEPHONE> + <of:TELEPHONE><#if telecomNumber.countryCode?has_content>${telecomNumber.countryCode?xml}-</#if>${telecomNumber.areaCode!?xml}-${telecomNumber.contactNumber!?xml}</of:TELEPHONE> </os:CONTACT> </#if> </os:PARTNER> @@ -122,35 +122,35 @@ under the License. <#if productType.isPhysical == "Y" || productType.isPhysical == "y"> <n:SHIPITEM> <os:QUANTITY> - <of:VALUE>${shipmentItem.quantity?if_exists}</of:VALUE> + <of:VALUE>${shipmentItem.quantity!}</of:VALUE> <of:NUMOFDEC>0</of:NUMOFDEC> <of:SIGN>+</of:SIGN> <of:UOM>EACH</of:UOM> </os:QUANTITY> - <of:ITEM>${shipmentItem.productId?if_exists}</of:ITEM> + <of:ITEM>${shipmentItem.productId!}</of:ITEM> <of:DISPOSITN>FIFO</of:DISPOSITN><#-- TODO: figure out if this is a reviewer order, if so set this to LIFO --> <n:DOCUMNTREF> <of:DOCTYPE>SHIPMENT</of:DOCTYPE> - <of:DOCUMENTID>${shipment.shipmentId?if_exists}</of:DOCUMENTID> - <of:LINENUM>${shipmentItem.shipmentItemSeqId?if_exists}</of:LINENUM> + <of:DOCUMENTID>${shipment.shipmentId!}</of:DOCUMENTID> + <of:LINENUM>${shipmentItem.shipmentItemSeqId!}</of:LINENUM> </n:DOCUMNTREF> </n:SHIPITEM> </#if> </#list> - <#list externalIdSet?if_exists as externalId> + <#list externalIdSet! as externalId> <n:DOCUMNTREF> <of:DOCTYPE>PARTNER_SO</of:DOCTYPE> - <of:DOCUMENTID>${externalId?if_exists?xml}</of:DOCUMENTID> + <of:DOCUMENTID>${externalId!?xml}</of:DOCUMENTID> </n:DOCUMNTREF> </#list> - <#list correspondingPoIdSet?if_exists as correspondingPoId> + <#list correspondingPoIdSet! as correspondingPoId> <n:DOCUMNTREF> <of:DOCTYPE>CUST_PO</of:DOCTYPE> - <of:DOCUMENTID>${correspondingPoId?if_exists?xml}</of:DOCUMENTID> + <of:DOCUMENTID>${correspondingPoId!?xml}</of:DOCUMENTID> </n:DOCUMNTREF> </#list> <#-- data preparation code to create the replacementReturnId; this is the returnId if the order is a return replacement order --> - <#if replacementReturnId?exists> + <#if replacementReturnId??> <n:DOCUMNTREF> <of:DOCTYPE>RMA</of:DOCTYPE> <of:DOCUMENTID>${replacementReturnId}</of:DOCUMENTID> Modified: ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl (original) +++ ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl Sat Aug 16 08:40:28 2014 @@ -33,19 +33,19 @@ under the License. <of:LOGICALID>${logicalId}</of:LOGICALID> <of:COMPONENT>INVENTORY</of:COMPONENT> <of:TASK>RMA</of:TASK> - <of:REFERENCEID>${referenceId?if_exists}</of:REFERENCEID> + <of:REFERENCEID>${referenceId!}</of:REFERENCEID> <of:CONFIRMATION>1</of:CONFIRMATION> <of:LANGUAGE>ENG</of:LANGUAGE> <of:CODEPAGE>NONE</of:CODEPAGE> <of:AUTHID>${authId}</of:AUTHID> </os:SENDER> - <os:DATETIMEISO>${sentDate?if_exists}</os:DATETIMEISO> + <os:DATETIMEISO>${sentDate!}</os:DATETIMEISO> </os:CNTROLAREA> <n:DATAAREA> <n:RECEIVE_DELIVERY> <n:RECEIPTHDR> - <os:DATETIMEISO>${entryDate?if_exists}</os:DATETIMEISO> - <of:RECEIPTID>${returnId?if_exists}</of:RECEIPTID> + <os:DATETIMEISO>${entryDate!}</os:DATETIMEISO> + <of:RECEIPTID>${returnId!}</of:RECEIPTID> <of:CARRIER></of:CARRIER> <of:NOTES></of:NOTES> <of:RECEIPTYPE>RMA</of:RECEIPTYPE> @@ -54,55 +54,55 @@ under the License. <#if (partyNameView.firstName)?has_content><#assign partyName = partyNameView.firstName/></#if> <#if (partyNameView.middleName)?has_content><#assign partyName = partyName + " " + partyNameView.middleName/></#if> <#if (partyNameView.lastName)?has_content><#assign partyName = partyName + " " + partyNameView.lastName/></#if> - <of:NAME>${postalAddress.toName?default(partyName)?if_exists?xml}</of:NAME> + <of:NAME>${postalAddress.toName?default(partyName)!?xml}</of:NAME> <of:PARTNRTYPE>SHIPFROM</of:PARTNRTYPE> <of:CURRENCY>USD</of:CURRENCY> <os:ADDRESS> - <of:ADDRLINE>${postalAddress.address1?if_exists?xml}</of:ADDRLINE> + <of:ADDRLINE>${postalAddress.address1!?xml}</of:ADDRLINE> <#if postalAddress.address2?has_content> - <of:ADDRLINE>${postalAddress.address2?if_exists?xml}</of:ADDRLINE> + <of:ADDRLINE>${postalAddress.address2!?xml}</of:ADDRLINE> </#if> - <of:CITY>${postalAddress.city?if_exists?xml}</of:CITY> - <of:COUNTRY>${postalAddress.countryGeoId?if_exists}</of:COUNTRY> + <of:CITY>${postalAddress.city!?xml}</of:CITY> + <of:COUNTRY>${postalAddress.countryGeoId!}</of:COUNTRY> <#-- <of:FAX></of:FAX> --> - <of:POSTALCODE>${postalAddress.postalCode?if_exists?xml}</of:POSTALCODE> - <of:STATEPROVN>${postalAddress.stateProvinceGeoId?if_exists}</of:STATEPROVN> - <of:TELEPHONE><#if telecomNumber.countryCode?has_content>${telecomNumber.countryCode?xml}-</#if>${telecomNumber.areaCode?if_exists?xml}-${telecomNumber.contactNumber?if_exists?xml}</of:TELEPHONE> + <of:POSTALCODE>${postalAddress.postalCode!?xml}</of:POSTALCODE> + <of:STATEPROVN>${postalAddress.stateProvinceGeoId!}</of:STATEPROVN> + <of:TELEPHONE><#if telecomNumber.countryCode?has_content>${telecomNumber.countryCode?xml}-</#if>${telecomNumber.areaCode!?xml}-${telecomNumber.contactNumber!?xml}</of:TELEPHONE> </os:ADDRESS> <os:CONTACT> - <of:NAME>${postalAddress.attnName?default(partyName)?if_exists?xml}</of:NAME> - <of:EMAIL>${emailString?if_exists?xml}</of:EMAIL> + <of:NAME>${postalAddress.attnName?default(partyName)!?xml}</of:NAME> + <of:EMAIL>${emailString!?xml}</of:EMAIL> <#-- <of:FAX></of:FAX> --> - <of:TELEPHONE><#if telecomNumber.countryCode?has_content>${telecomNumber.countryCode?xml}-</#if>${telecomNumber.areaCode?if_exists?xml}-${telecomNumber.contactNumber?if_exists?xml}</of:TELEPHONE> + <of:TELEPHONE><#if telecomNumber.countryCode?has_content>${telecomNumber.countryCode?xml}-</#if>${telecomNumber.areaCode!?xml}-${telecomNumber.contactNumber!?xml}</of:TELEPHONE> </os:CONTACT> </#if> </os:PARTNER> </n:RECEIPTHDR> <n:RECEIPTUNT> <os:QUANTITY> - <of:VALUE>${totalQty?if_exists}</of:VALUE> + <of:VALUE>${totalQty!}</of:VALUE> <of:NUMOFDEC>0</of:NUMOFDEC> <of:SIGN>+</of:SIGN> <of:UOM>EACH</of:UOM> </os:QUANTITY> <#list returnItems as returnItem> <#assign returnReason = returnItem.getRelatedOne("ReturnReason", false)/> - <#assign serialNumberList = serialNumberListByReturnItemSeqIdMap.get(returnItem.returnItemSeqId)?if_exists/> + <#assign serialNumberList = serialNumberListByReturnItemSeqIdMap.get(returnItem.returnItemSeqId)!/> <n:RECEIPTITM> <os:QUANTITY> - <of:VALUE>${returnItem.returnQuantity?if_exists}</of:VALUE> + <of:VALUE>${returnItem.returnQuantity!}</of:VALUE> <of:NUMOFDEC>0</of:NUMOFDEC> <of:SIGN>+</of:SIGN> <of:UOM>EACH</of:UOM> </os:QUANTITY> - <of:ITEM>${returnItem.productId?if_exists}</of:ITEM> - <of:NOTES>${returnReason.description?if_exists?xml}</of:NOTES> + <of:ITEM>${returnItem.productId!}</of:ITEM> + <of:NOTES>${returnReason.description!?xml}</of:NOTES> <os:DOCUMNTREF> <of:DOCTYPE>RMA</of:DOCTYPE> <of:DOCUMENTID>${returnItem.returnId}</of:DOCUMENTID> <of:LINENUM>${returnItem.returnItemSeqId}</of:LINENUM> </os:DOCUMNTREF> - <#list serialNumberList?if_exists as serialNumber> + <#list serialNumberList! as serialNumber> <n:INVDETAIL> <of:SERIALNUM>${serialNumber?xml}</of:SERIALNUM> </n:INVDETAIL> Modified: ofbiz/trunk/specialpurpose/projectmgr/main.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/main.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/main.ftl (original) +++ ofbiz/trunk/specialpurpose/projectmgr/main.ftl Sat Aug 16 08:40:28 2014 @@ -20,15 +20,15 @@ under the License. <br /> <h2>${text1}</h2> <br /> -<#if text2?exists> +<#if text2??> <h2>${text2}</h2> </#if><br /> -<#if link1?exists> +<#if link1??> <h2>1. <a href="${link1}" target="new1">${link1Text}</a></h2> </#if> -<#if link2?exists> +<#if link2??> <h2>2. <a href="${link2}" target="new2">${link2Text}</a></h2> </#if> -<#if link3?exists> +<#if link3??> <h2>3. <a href="${link3}" target="new3">${link3Text}</a></h2> </#if> Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl Sat Aug 16 08:40:28 2014 @@ -21,7 +21,7 @@ under the License. <div class="screenlet-title-bar"> <ul> <#if task?has_content> - <li class="h3"> ${uiLabelMap.PageTitleEditTask} #${project.workEffortId?if_exists} ${uiLabelMap.CommonInformation}</li> + <li class="h3"> ${uiLabelMap.PageTitleEditTask} #${project.workEffortId!} ${uiLabelMap.CommonInformation}</li> <#else> <li class="h3"> ${uiLabelMap.PageTitleAddTask}</li> </#if> @@ -38,17 +38,17 @@ under the License. </#if> <table width="100%" cellpadding="2" cellspacing="0"> <tr> - <#if !(task?exists)> - <td><input type="hidden" name="workEffortTypeId" value="${parameters.workEffortTypeId?if_exists}"/></td> + <#if !(task??)> + <td><input type="hidden" name="workEffortTypeId" value="${parameters.workEffortTypeId!}"/></td> <#else> - <td><input type="hidden" name="workEffortTypeId" value="${task.workEffortTypeId?if_exists}"/></td> - <td><input type="hidden" name="workEffortId" value="${task.workEffortId?if_exists}"/></td> - <td><input type="hidden" name="workEffortName" value="${task.workEffortName?if_exists}"/></td> + <td><input type="hidden" name="workEffortTypeId" value="${task.workEffortTypeId!}"/></td> + <td><input type="hidden" name="workEffortId" value="${task.workEffortId!}"/></td> + <td><input type="hidden" name="workEffortName" value="${task.workEffortName!}"/></td> </#if> </tr> <tr> - <td><input type="hidden" name="workEffortIdFrom" value="${workEffortIdFrom?if_exists}"/></td> - <td><input type="hidden" name="workEffortParentId" value="${workEffortIdFrom?if_exists}"/></td> + <td><input type="hidden" name="workEffortIdFrom" value="${workEffortIdFrom!}"/></td> + <td><input type="hidden" name="workEffortParentId" value="${workEffortIdFrom!}"/></td> <td><input type="hidden" name="workEffortAssocTypeId" value="WORK_EFF_BREAKDOWN"/> </tr> <tr> @@ -63,23 +63,23 @@ under the License. </td> </tr> <tr> - <#if task?exists> + <#if task??> <td class="label" >${uiLabelMap.ProjectMgrWorkEffortId}</td> - <td>${task.workEffortId?if_exists}</td> + <td>${task.workEffortId!}</td> </#if> </tr> <tr> <td class="label" >${uiLabelMap.CommonName}*</td> - <#if task?exists> - <td>${task.workEffortName?if_exists}<span class="tooltip">${uiLabelMap.CommonRequired}</span></td> + <#if task??> + <td>${task.workEffortName!}<span class="tooltip">${uiLabelMap.CommonRequired}</span></td> <#else> <td><input type="text" name="workEffortName" value=""/><span class="tooltip">${uiLabelMap.CommonRequired}</span></td> </#if> </tr> <tr> <td class="label" >${uiLabelMap.CommonDescription}</td> - <#if task?exists> - <td><input type="text" name="description" value="${task.description?if_exists}"/></td> + <#if task??> + <td><input type="text" name="description" value="${task.description!}"/></td> <#else> <td><input type="text" name="description" value=""/></td> </#if> @@ -88,8 +88,8 @@ under the License. <td class="label" >${uiLabelMap.CommonStatus}</td> <td> <select name="currentStatusId"> - <#if task?exists> - <#assign currentStatus = task.geRelatedOne("CurrentStatusItem")?if_exists> + <#if task??> + <#assign currentStatus = task.geRelatedOne("CurrentStatusItem")!> <option selected="selected" value="${currentStatus.currentStatusId}">${currentStatus.description}</option> <#assign statusValidChangeToDetailList = delegator.findByAnd("StatusValidChangeToDetail", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", currentStatus.currentStatusId), null, false)> <#list statusValidChangeToDetailList as statusValidChangeToDetail> @@ -100,13 +100,13 @@ under the License. <#assign statusItemTasks = delegator.findByAnd("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusTypeId", "TASK_STATUS"), null, false)> <#assign statusItemEvents = delegator.findByAnd("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusTypeId", "EVENT_STATUS"), null, false)> <#list statusItemGenrals as statusItem> - <option value="${statusItem.statusId?if_exists}">[${uiLabelMap.WorkEffortGeneral}]${statusItem.description}</option> + <option value="${statusItem.statusId!}">[${uiLabelMap.WorkEffortGeneral}]${statusItem.description}</option> </#list> <#list statusItemTasks as statusItem> - <option value="${statusItem.statusId?if_exists}">[${uiLabelMap.WorkEffortTask}]${statusItem.description}</option> + <option value="${statusItem.statusId!}">[${uiLabelMap.WorkEffortTask}]${statusItem.description}</option> </#list> <#list statusItemEvents as statusItem> - <option value="${statusItem.statusId?if_exists}">[${uiLabelMap.WorkEffortEvent}]${statusItem.description}</option> + <option value="${statusItem.statusId!}">[${uiLabelMap.WorkEffortEvent}]${statusItem.description}</option> </#list> </#if> </select> @@ -116,10 +116,10 @@ under the License. <td class="label">${uiLabelMap.CommonPriority}</td> <td> <#if task?has_content> - <#assign priority = task.priority?if_exists> + <#assign priority = task.priority!> </#if> <select name="priority" size="1"> - <#if priority?exists> + <#if priority??> <option selected="selected" value="${priority}">${priority}</option> <option></option> <option value=1>${uiLabelMap.WorkEffortPriorityOne}</option> @@ -151,10 +151,10 @@ under the License. <td> <#assign enumerations = delegator.findByAnd("Enumeration", Static["org.ofbiz.base.util.UtilMisc"].toMap("enumTypeId", "WORK_EFF_SCOPE"), null, false)> <select name="scopeEnumId"> - <#if task?exists> - <#assign scopeEnumId = task.scopeEnumId?if_exists> + <#if task??> + <#assign scopeEnumId = task.scopeEnumId!> <#list enumerations as enumeration> - <option <#if "${enumeration.enumId}" == scopeEnumId?if_exists>selected="selected"</#if>>${enumeration.description}</option> + <option <#if "${enumeration.enumId}" == scopeEnumId!>selected="selected"</#if>>${enumeration.description}</option> </#list> <#else> <#list enumerations as enumeration> @@ -167,8 +167,8 @@ under the License. <tr> <td class="label">${uiLabelMap.WorkEffortEstimatedStartDate}</td> <td> - <#if task?exists> - <@htmlTemplate.renderDateTimeField name="estimatedStartDate" className="" event="" action="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${task.estimatedStartDate?if_exists}" size="25" maxlength="30" id="estimatedStartDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <#if task??> + <@htmlTemplate.renderDateTimeField name="estimatedStartDate" className="" event="" action="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${task.estimatedStartDate!}" size="25" maxlength="30" id="estimatedStartDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <#else> <@htmlTemplate.renderDateTimeField name="estimatedStartDate" className="" event="" action="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="estimatedStartDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </#if> @@ -177,8 +177,8 @@ under the License. <tr> <td class="label">${uiLabelMap.WorkEffortEstimatedCompletionDate}</td> <td> - <#if task?exists> - <@htmlTemplate.renderDateTimeField name="estimatedCompletionDate" className="" event="" action="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${task.estimatedCompletionDate?if_exists}" size="25" maxlength="30" id="estimatedCompletionDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <#if task??> + <@htmlTemplate.renderDateTimeField name="estimatedCompletionDate" className="" event="" action="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${task.estimatedCompletionDate!}" size="25" maxlength="30" id="estimatedCompletionDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <#else> <@htmlTemplate.renderDateTimeField name="estimatedCompletionDate" className="" event="" action="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="estimatedCompletionDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </#if> @@ -189,8 +189,8 @@ under the License. <td> - <#if task?exists> - <@htmlTemplate.renderDateTimeField name="actualStartDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${task.actualStartDate?if_exists}" size="25" maxlength="30" id="actualStartDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <#if task??> + <@htmlTemplate.renderDateTimeField name="actualStartDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${task.actualStartDate!}" size="25" maxlength="30" id="actualStartDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <#else> <@htmlTemplate.renderDateTimeField name="actualStartDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="actualStartDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </#if> @@ -200,8 +200,8 @@ under the License. <td class="label">${uiLabelMap.FormFieldTitle_actualCompletionDate}</td> <td> - <#if task?exists> - <@htmlTemplate.renderDateTimeField name="actualCompletionDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${task.actualCompletionDate?if_exists}" size="25" maxlength="30" id="actualCompletionDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <#if task??> + <@htmlTemplate.renderDateTimeField name="actualCompletionDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${task.actualCompletionDate!}" size="25" maxlength="30" id="actualCompletionDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <#else> <@htmlTemplate.renderDateTimeField name="actualCompletionDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="actualCompletionDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </#if> Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/ganttChart.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/ganttChart.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/ganttChart.ftl (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/ganttChart.ftl Sat Aug 16 08:40:28 2014 @@ -30,13 +30,13 @@ g.setShowComp(1); // Show/Hide % Complet <#list phaseTaskList as t> <#if t.workEffortTypeId == "PHASE"> - g.AddTaskItem(new JSGantt.TaskItem(${t.phaseNr}, "${t.phaseSeqNum?if_exists}. ${t.phaseName}", "", "", "00ff00", "", 0, "", 0, 1, 0, 1)); + g.AddTaskItem(new JSGantt.TaskItem(${t.phaseNr}, "${t.phaseSeqNum!}. ${t.phaseName}", "", "", "00ff00", "", 0, "", 0, 1, 0, 1)); </#if> <#if t.workEffortTypeId == "TASK"> - g.AddTaskItem(new JSGantt.TaskItem(${t.taskNr},"${t.taskSeqNum?if_exists}. ${t.taskName}","${StringUtil.wrapString(t.estimatedStartDate)}", "${StringUtil.wrapString(t.estimatedCompletionDate)}","009900", "${t.url}", 0 , "${t.resource?if_exists}", ${t.completion?if_exists} , 0, ${t.phaseNr}, 1<#if t.preDecessor?exists>, "${t.preDecessor}"</#if>)); + g.AddTaskItem(new JSGantt.TaskItem(${t.taskNr},"${t.taskSeqNum!}. ${t.taskName}","${StringUtil.wrapString(t.estimatedStartDate)}", "${StringUtil.wrapString(t.estimatedCompletionDate)}","009900", "${t.url}", 0 , "${t.resource!}", ${t.completion!} , 0, ${t.phaseNr}, 1<#if t.preDecessor??>, "${t.preDecessor}"</#if>)); </#if> <#if t.workEffortTypeId == "MILESTONE"> - g.AddTaskItem(new JSGantt.TaskItem(${t.taskNr},"${t.taskName}","${StringUtil.wrapString(t.estimatedStartDate)}", "${StringUtil.wrapString(t.estimatedCompletionDate)}","00ff00", "", 1 , "${t.resource?if_exists}", ${t.completion?if_exists} , 0,${t.phaseNr}, "", "" )); + g.AddTaskItem(new JSGantt.TaskItem(${t.taskNr},"${t.taskName}","${StringUtil.wrapString(t.estimatedStartDate)}", "${StringUtil.wrapString(t.estimatedCompletionDate)}","00ff00", "", 1 , "${t.resource!}", ${t.completion!} , 0,${t.phaseNr}, "", "" )); </#if> </#list> Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/project/summary/noteinfo.ftl Sat Aug 16 08:40:28 2014 @@ -23,9 +23,9 @@ under the License. <ul> <li class="h3"> ${uiLabelMap.WorkEffortNotes}</li> <#--if project?has_content> - <li><a href="<@ofbizUrl>newNotesForProject?workEffortId=${project.workEffortId?if_exists}&showForm=Y</@ofbizUrl>">${uiLabelMap.ProjectMgrNotesCreateNew}</a></li> + <li><a href="<@ofbizUrl>newNotesForProject?workEffortId=${project.workEffortId!}&showForm=Y</@ofbizUrl>">${uiLabelMap.ProjectMgrNotesCreateNew}</a></li> <#else> - <li><a href="<@ofbizUrl>newNotesForTask?workEffortId=${task.workEffortId?if_exists}&showForm=Y</@ofbizUrl>">${uiLabelMap.ProjectMgrNotesCreateNew}</a></li> + <li><a href="<@ofbizUrl>newNotesForTask?workEffortId=${task.workEffortId!}&showForm=Y</@ofbizUrl>">${uiLabelMap.ProjectMgrNotesCreateNew}</a></li> </#if--> </ul> <br class="clear" /> @@ -40,26 +40,26 @@ under the License. <tr> <td valign="top" width="35%"> <div> <b>${uiLabelMap.CommonBy}: </b>${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, note.noteParty, true)}</div> - <div> <b>${uiLabelMap.CommonAt}: </b>${Static["org.ofbiz.base.util.UtilDateTime"].timeStampToString(note.noteDateTime?if_exists,"dd-MM-yyyy HH:mm",Static["java.util.TimeZone"].getDefault(),context.get("locale"))}</div> + <div> <b>${uiLabelMap.CommonAt}: </b>${Static["org.ofbiz.base.util.UtilDateTime"].timeStampToString(note.noteDateTime!,"dd-MM-yyyy HH:mm",Static["java.util.TimeZone"].getDefault(),context.get("locale"))}</div> </td> <td valign="top" width="50%"> - <div>${note.noteInfo?if_exists}</div> + <div>${note.noteInfo!}</div> </td> <td align="right" valign="top" width="15%"> - <#if note.internalNote?if_exists == "N"> + <#if note.internalNote! == "N"> <div>${uiLabelMap.ProjectMgrPrintableNote}</div> <#if project?has_content> - <a href="<@ofbizUrl>updateProjectNote?workEffortId=${project.workEffortId?if_exists}&noteId=${note.noteId}&internalNote=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNotesPrivate}</a> + <a href="<@ofbizUrl>updateProjectNote?workEffortId=${project.workEffortId!}&noteId=${note.noteId}&internalNote=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNotesPrivate}</a> <#else> - <a href="<@ofbizUrl>updateTaskNoteSummary?workEffortId=${task.workEffortId?if_exists}&noteId=${note.noteId}&internalNote=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNotesPrivate}</a> + <a href="<@ofbizUrl>updateTaskNoteSummary?workEffortId=${task.workEffortId!}&noteId=${note.noteId}&internalNote=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNotesPrivate}</a> </#if> </#if> - <#if note.internalNote?if_exists == "Y"> + <#if note.internalNote! == "Y"> <div>${uiLabelMap.OrderNotPrintableNote}</div> <#if project?has_content> - <a href="<@ofbizUrl>updateProjectNote?workEffortId=${project.workEffortId?if_exists}&noteId=${note.noteId}&internalNote=N</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNotesPublic}</a> + <a href="<@ofbizUrl>updateProjectNote?workEffortId=${project.workEffortId!}&noteId=${note.noteId}&internalNote=N</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNotesPublic}</a> <#else> - <a href="<@ofbizUrl>updateTaskNoteSummary?workEffortId=${task.workEffortId?if_exists}&noteId=${note.noteId}&internalNote=N</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNotesPublic}</a> + <a href="<@ofbizUrl>updateTaskNoteSummary?workEffortId=${task.workEffortId!}&noteId=${note.noteId}&internalNote=N</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNotesPublic}</a> </#if> </#if> </td> @@ -80,7 +80,7 @@ under the License. </td> </tr> </table> - <#if parameters.showForm?exists> + <#if parameters.showForm??> <div class="screenlet-title-bar"> <ul> <li class="h3"> ${uiLabelMap.OrderAddNote}</li> Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/request/overViewRequestItems.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/request/overViewRequestItems.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/request/overViewRequestItems.ftl (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/request/overViewRequestItems.ftl Sat Aug 16 08:40:28 2014 @@ -81,7 +81,7 @@ under the License. <#else> <#assign row="alternate-row"> </#if> - <#assign partyNameView = delegator.findOne("PartyNameView", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", custRequestItemNoteViewList.partyId), false)?if_exists/> + <#assign partyNameView = delegator.findOne("PartyNameView", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", custRequestItemNoteViewList.partyId), false)!/> <tr class="${row}"> <td> </td> @@ -92,7 +92,7 @@ under the License. ${custRequestItemNoteViewList.noteInfo} </td> <td > - ${partyNameView.groupName?if_exists} ${partyNameView.firstName?if_exists} ${partyNameView.lastName?if_exists} + ${partyNameView.groupName!} ${partyNameView.firstName!} ${partyNameView.lastName!} </td> <td> ${custRequestItemNoteViewList.noteDateTime.toString().substring(0,10)} Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/survey/ListSurveys.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/survey/ListSurveys.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/survey/ListSurveys.ftl (original) +++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/survey/ListSurveys.ftl Sat Aug 16 08:40:28 2014 @@ -41,23 +41,23 @@ under the License. <#assign survey = productStoreSurveyAppl.getRelatedOne("Survey", false)> <tr> <form method="post" action="<@ofbizUrl>updateWorkEffortSurveyAppl</@ofbizUrl>" name="editWorkEffortSurveyAppl_${workEffortSurveyAppl_index}"> - <td><a href="/content/control/EditSurvey?surveyId=${workEffortSurveyAppl.surveyId?if_exists}" class="buttontext">${workEffortSurveyAppl.surveyId?if_exists} - ${survey.surveyName?if_exists}</a></td> - <td>${workEffortSurveyAppl.fromDate?if_exists}</td> + <td><a href="/content/control/EditSurvey?surveyId=${workEffortSurveyAppl.surveyId!}" class="buttontext">${workEffortSurveyAppl.surveyId!} - ${survey.surveyName!}</a></td> + <td>${workEffortSurveyAppl.fromDate!}</td> <td> - <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(workEffortSurveyAppl.thruDate)?if_exists}" size="25" maxlength="30" id="thruDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${(workEffortSurveyAppl.thruDate)!}" size="25" maxlength="30" id="thruDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> </td> - <td><a href="<@ofbizUrl>testWorkEffortSurvey?productStoreSurveyId=${productStoreSurveyAppl.productStoreSurveyId?if_exists}&workEffortId=${workEffortSurveyAppl.workEffortId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceTakeSurvey}</a></td> - <#if !isReadable?exists> - <input type="hidden" name="surveyId" value="${workEffortSurveyAppl.surveyId?if_exists}"/> - <input type="hidden" name="workEffortId" value="${workEffortSurveyAppl.workEffortId?if_exists}"/> - <input type="hidden" name="fromDate" value="${workEffortSurveyAppl.fromDate?if_exists}"/> + <td><a href="<@ofbizUrl>testWorkEffortSurvey?productStoreSurveyId=${productStoreSurveyAppl.productStoreSurveyId!}&workEffortId=${workEffortSurveyAppl.workEffortId!}</@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceTakeSurvey}</a></td> + <#if !isReadable??> + <input type="hidden" name="surveyId" value="${workEffortSurveyAppl.surveyId!}"/> + <input type="hidden" name="workEffortId" value="${workEffortSurveyAppl.workEffortId!}"/> + <input type="hidden" name="fromDate" value="${workEffortSurveyAppl.fromDate!}"/> <td><input type="submit" name="submitBtn" value='${uiLabelMap.CommonUpdate}' /> </td> </form> <td> <form id="deleteWorkEffortSurveyAppl_${workEffortSurveyAppl_index}" method="post" action="<@ofbizUrl>deleteWorkEffortSurveyAppl</@ofbizUrl>"> - <input type="hidden" name="surveyId" value="${workEffortSurveyAppl.surveyId?if_exists}" /> - <input type="hidden" name="workEffortId" value="${workEffortSurveyAppl.workEffortId?if_exists}" /> - <input type="hidden" name="fromDate" value="${workEffortSurveyAppl.fromDate?if_exists}" /> + <input type="hidden" name="surveyId" value="${workEffortSurveyAppl.surveyId!}" /> + <input type="hidden" name="workEffortId" value="${workEffortSurveyAppl.workEffortId!}" /> + <input type="hidden" name="fromDate" value="${workEffortSurveyAppl.fromDate!}" /> <a href="javascript:document.getElementById('deleteWorkEffortSurveyAppl_${workEffortSurveyAppl_index}').submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> </form> </td> Modified: ofbiz/trunk/specialpurpose/scrum/templates/AcceptedBacklogNotification.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/templates/AcceptedBacklogNotification.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/templates/AcceptedBacklogNotification.ftl (original) +++ ofbiz/trunk/specialpurpose/scrum/templates/AcceptedBacklogNotification.ftl Sat Aug 16 08:40:28 2014 @@ -22,15 +22,15 @@ under the License. <title>${title}</title> </head> <body> - <p>Hello ${person.firstName?if_exists} ${person.lastName?if_exists},</p> - <p>Your backlog: <b>${custRequest.description?if_exists} [${custRequest.custRequestId}] - <#if informationMap.workEffortId?has_content><br />in sprint: <b>${informationMap.workEffortName?if_exists} [${informationMap.workEffortId?if_exists}]</b></#if> - <#if informationMap.productId?has_content><br />of the product: <b>${informationMap.internalName?if_exists} [${informationMap.productId?if_exists}]</b></#if> + <p>Hello ${person.firstName!} ${person.lastName!},</p> + <p>Your backlog: <b>${custRequest.description!} [${custRequest.custRequestId}] + <#if informationMap.workEffortId?has_content><br />in sprint: <b>${informationMap.workEffortName!} [${informationMap.workEffortId!}]</b></#if> + <#if informationMap.productId?has_content><br />of the product: <b>${informationMap.internalName!} [${informationMap.productId!}]</b></#if> <#if removedFromSprint = true> has been removed from sprint. <#else> has been received.</#if> <br /> <br /> <#if custRequest.fromPartyId == partyIdTo> - The complete information of this backlog/request can be found <a href="${StringUtil.wrapString(baseSecureUrl?if_exists)}/scrum/control/ViewProdBacklogItem?custRequestId=${custRequest.custRequestId?if_exists}">here.....</a> + The complete information of this backlog/request can be found <a href="${StringUtil.wrapString(baseSecureUrl!)}/scrum/control/ViewProdBacklogItem?custRequestId=${custRequest.custRequestId!}">here.....</a> <br /><br /> </#if> Regards.<br /><br /> Modified: ofbiz/trunk/specialpurpose/scrum/templates/ActiveSprintNotification.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/templates/ActiveSprintNotification.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/templates/ActiveSprintNotification.ftl (original) +++ ofbiz/trunk/specialpurpose/scrum/templates/ActiveSprintNotification.ftl Sat Aug 16 08:40:28 2014 @@ -22,12 +22,12 @@ under the License. <title>${title}</title> </head> <body> - <p>Hello ${person.firstName?if_exists} ${person.lastName?if_exists},</p> - <p>Your Sprint <b>${sprint.workEffortName?if_exists} [${sprint.workEffortId?if_exists}]</b> in project <b>${project.workEffortName?if_exists} [${project.workEffortId?if_exists}]</b> - of the product <b>${prodcut.internalName?if_exists} [${prodcut.productId?if_exists}]</b> has been started. + <p>Hello ${person.firstName!} ${person.lastName!},</p> + <p>Your Sprint <b>${sprint.workEffortName!} [${sprint.workEffortId!}]</b> in project <b>${project.workEffortName!} [${project.workEffortId!}]</b> + of the product <b>${prodcut.internalName!} [${prodcut.productId!}]</b> has been started. <br /> <br /> - The complete information about this sprint can be found <a href="${StringUtil.wrapString(baseSecureUrl?if_exists)}/scrum/control/ViewSprint?sprintId=${sprint.workEffortId?if_exists}">here.....</a> + The complete information about this sprint can be found <a href="${StringUtil.wrapString(baseSecureUrl!)}/scrum/control/ViewSprint?sprintId=${sprint.workEffortId!}">here.....</a> <br /><br /> Regards.<br /><br /> Thank you for your business. Modified: ofbiz/trunk/specialpurpose/scrum/templates/CancelledBacklogNotification.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/templates/CancelledBacklogNotification.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/templates/CancelledBacklogNotification.ftl (original) +++ ofbiz/trunk/specialpurpose/scrum/templates/CancelledBacklogNotification.ftl Sat Aug 16 08:40:28 2014 @@ -22,14 +22,14 @@ under the License. <title>${title}</title> </head> <body> - <p>Hello ${person.firstName?if_exists} ${person.lastName?if_exists},</p> - <p>Your Customer Request <b>${custRequest.custRequestName?if_exists} [${custRequest.custRequestId}] </b> <#if informationMap.workEffortId?has_content>in sprint <b>${informationMap.workEffortName?if_exists} [${informationMap.workEffortId?if_exists}]</b></#if> - <#if informationMap.productId?has_content>of the product <b>${informationMap.internalName?if_exists} [${informationMap.productId?if_exists}]</#if></b> has been CANCELLED. - <p>Reason for Cancellation: ${custRequest.reason?if_exists}</p> + <p>Hello ${person.firstName!} ${person.lastName!},</p> + <p>Your Customer Request <b>${custRequest.custRequestName!} [${custRequest.custRequestId}] </b> <#if informationMap.workEffortId?has_content>in sprint <b>${informationMap.workEffortName!} [${informationMap.workEffortId!}]</b></#if> + <#if informationMap.productId?has_content>of the product <b>${informationMap.internalName!} [${informationMap.productId!}]</#if></b> has been CANCELLED. + <p>Reason for Cancellation: ${custRequest.reason!}</p> <br /> <br /> <#if custRequest.fromPartyId == partyIdTo> - The complete information about this request can be found <a href="${StringUtil.wrapString(baseSecureUrl?if_exists)}/scrum/control/ViewProdBacklogItem?custRequestId=${custRequest.custRequestId?if_exists}">here.....</a> + The complete information about this request can be found <a href="${StringUtil.wrapString(baseSecureUrl!)}/scrum/control/ViewProdBacklogItem?custRequestId=${custRequest.custRequestId!}">here.....</a> <br /><br /> </#if> Regards.<br /><br /> Modified: ofbiz/trunk/specialpurpose/scrum/templates/ClosedSprintNotification.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/templates/ClosedSprintNotification.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/templates/ClosedSprintNotification.ftl (original) +++ ofbiz/trunk/specialpurpose/scrum/templates/ClosedSprintNotification.ftl Sat Aug 16 08:40:28 2014 @@ -22,12 +22,12 @@ under the License. <title>${title}</title> </head> <body> - <p>Hello ${person.firstName?if_exists} ${person.lastName?if_exists},</p> - <p>Your Sprint <b>${sprint.workEffortName?if_exists} [${sprint.workEffortId}]</b> in the project <b>${project.workEffortName?if_exists} [${project.workEffortId?if_exists}]</b> - of the product <b>${prodcut.internalName?if_exists} [${prodcut.productId?if_exists}]</b> has been Closed. + <p>Hello ${person.firstName!} ${person.lastName!},</p> + <p>Your Sprint <b>${sprint.workEffortName!} [${sprint.workEffortId}]</b> in the project <b>${project.workEffortName!} [${project.workEffortId!}]</b> + of the product <b>${prodcut.internalName!} [${prodcut.productId!}]</b> has been Closed. <br /> <br /> - The complete information about this sprint can be found <a href="${StringUtil.wrapString(baseSecureUrl?if_exists)}/scrum/control/ViewSprint?sprintId=${sprint.workEffortId}">here.....</a> + The complete information about this sprint can be found <a href="${StringUtil.wrapString(baseSecureUrl!)}/scrum/control/ViewSprint?sprintId=${sprint.workEffortId}">here.....</a> <br /><br /> Regards.<br /><br /> Thank you for your business. Modified: ofbiz/trunk/specialpurpose/scrum/templates/CompletedBacklogNotification.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/templates/CompletedBacklogNotification.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/templates/CompletedBacklogNotification.ftl (original) +++ ofbiz/trunk/specialpurpose/scrum/templates/CompletedBacklogNotification.ftl Sat Aug 16 08:40:28 2014 @@ -22,13 +22,13 @@ under the License. <title>${title}</title> </head> <body> - <p>Hello ${person.firstName?if_exists} ${person.lastName?if_exists},</p> - <p>Your backlog <b>${custRequest.description?if_exists} [${custRequest.custRequestId}]</b> <#if informationMap.workEffortId?has_content>in sprint <b>${informationMap.workEffortName?if_exists} [${informationMap.workEffortId?if_exists}]</b></#if> - <#if informationMap.productId?has_content>of the product <b>${informationMap.internalName?if_exists} [${informationMap.productId?if_exists}]</#if></b> has been completed. + <p>Hello ${person.firstName!} ${person.lastName!},</p> + <p>Your backlog <b>${custRequest.description!} [${custRequest.custRequestId}]</b> <#if informationMap.workEffortId?has_content>in sprint <b>${informationMap.workEffortName!} [${informationMap.workEffortId!}]</b></#if> + <#if informationMap.productId?has_content>of the product <b>${informationMap.internalName!} [${informationMap.productId!}]</#if></b> has been completed. <br /> <br /> <#if custRequest.fromPartyId == partyIdTo> - The complete information about this sprint can be found <a href="${StringUtil.wrapString(baseSecureUrl?if_exists)}/scrum/control/ViewProdBacklogItem?custRequestId=${custRequest.custRequestId?if_exists}">here.....</a> + The complete information about this sprint can be found <a href="${StringUtil.wrapString(baseSecureUrl!)}/scrum/control/ViewProdBacklogItem?custRequestId=${custRequest.custRequestId!}">here.....</a> <br /><br /> </#if> Regards.<br /><br /> Modified: ofbiz/trunk/specialpurpose/scrum/templates/ReviewedBacklogNotification.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/templates/ReviewedBacklogNotification.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/templates/ReviewedBacklogNotification.ftl (original) +++ ofbiz/trunk/specialpurpose/scrum/templates/ReviewedBacklogNotification.ftl Sat Aug 16 08:40:28 2014 @@ -22,14 +22,14 @@ under the License. <title>${title}</title> </head> <body> - <p>Hello ${person.firstName?if_exists} ${person.lastName?if_exists},</p> - <p>Your backlog <b>${custRequest.description?if_exists} [${custRequest.custRequestId}]</b> - <#if informationMap.workEffortId?has_content>has been added to sprint <b>${informationMap.workEffortName?if_exists} [${informationMap.workEffortId?if_exists}]</b></#if><br /> - <#if informationMap.productId?has_content>The related product: <b>${informationMap.internalName?if_exists} [${informationMap.productId?if_exists}]</#if></b>. + <p>Hello ${person.firstName!} ${person.lastName!},</p> + <p>Your backlog <b>${custRequest.description!} [${custRequest.custRequestId}]</b> + <#if informationMap.workEffortId?has_content>has been added to sprint <b>${informationMap.workEffortName!} [${informationMap.workEffortId!}]</b></#if><br /> + <#if informationMap.productId?has_content>The related product: <b>${informationMap.internalName!} [${informationMap.productId!}]</#if></b>. <br /> <br /> <#if custRequest.fromPartyId == partyIdTo> - The complete information about this sprint can be found <a href="${StringUtil.wrapString(baseSecureUrl?if_exists)}/scrum/control/ViewProdBacklogItem?custRequestId=${custRequest.custRequestId?if_exists}">here.....</a> + The complete information about this sprint can be found <a href="${StringUtil.wrapString(baseSecureUrl!)}/scrum/control/ViewProdBacklogItem?custRequestId=${custRequest.custRequestId!}">here.....</a> <br /><br /> </#if> Regards.<br /><br /> Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/includes/burndown.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/includes/burndown.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/includes/burndown.ftl (original) +++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/includes/burndown.ftl Sat Aug 16 08:40:28 2014 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<#assign sprint = delegator.findOne("WorkEffort", Static["org.ofbiz.base.util.UtilMisc"].toMap("workEffortId", parameters.get("sprintId")), false)?if_exists /> +<#assign sprint = delegator.findOne("WorkEffort", Static["org.ofbiz.base.util.UtilMisc"].toMap("workEffortId", parameters.get("sprintId")), false)! /> <#assign actualStartDay = Static["org.ofbiz.base.util.UtilDateTime"].getDayStart(sprint.actualStartDate, timeZone, locale)/> <#assign actualCompletionDay = Static["org.ofbiz.base.util.UtilDateTime"].getDayStart(sprint.actualCompletionDate, timeZone, locale)/> <#assign dayNumber = ((actualCompletionDay.getTime() - actualStartDay.getTime())/1000/60/60/24) + 1/> @@ -26,12 +26,12 @@ under the License. <#if members.size() > 0 > <#assign maxHours = estimatedHrs * members.size()/> <div id="params_birtReport" style='display:none'> - <INPUT type="HIDDEN" name="sprintId" value="${sprint.workEffortId?if_exists}"/> - <INPUT type="HIDDEN" name="actualStartDate" value="${sprint.actualStartDate?if_exists}"/> - <INPUT type="HIDDEN" name="actualCompletionDate" value="${sprint.actualCompletionDate?if_exists}"/> - <INPUT type="HIDDEN" name="dayNumber" value="${dayNumber?if_exists}"/> - <INPUT type="HIDDEN" name="estimatedHrs" value="${estimatedHrs?if_exists}"/> - <INPUT type="HIDDEN" name="maxHours" value="${maxHours?if_exists}"/> + <INPUT type="HIDDEN" name="sprintId" value="${sprint.workEffortId!}"/> + <INPUT type="HIDDEN" name="actualStartDate" value="${sprint.actualStartDate!}"/> + <INPUT type="HIDDEN" name="actualCompletionDate" value="${sprint.actualCompletionDate!}"/> + <INPUT type="HIDDEN" name="dayNumber" value="${dayNumber!}"/> + <INPUT type="HIDDEN" name="estimatedHrs" value="${estimatedHrs!}"/> + <INPUT type="HIDDEN" name="maxHours" value="${maxHours!}"/> </div> <form id="form_birtReport" method="post"></form> <script type="text/javascript"> Modified: ofbiz/trunk/specialpurpose/scrum/webapp/scrum/includes/revision.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/webapp/scrum/includes/revision.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/webapp/scrum/includes/revision.ftl (original) +++ ofbiz/trunk/specialpurpose/scrum/webapp/scrum/includes/revision.ftl Sat Aug 16 08:40:28 2014 @@ -18,7 +18,7 @@ under the License. --> <#if result?has_content> <div align="center"> -<h2>Subversion Information for repository : <b><a href=${result.repository?if_exists}> ${result.repository?if_exists}</a></b>, revision# <b>${result.revision?if_exists}</b></h2> +<h2>Subversion Information for repository : <b><a href=${result.repository!}> ${result.repository!}</a></b>, revision# <b>${result.revision!}</b></h2> </div> <div> <br/><h3>Log message</h3> @@ -26,7 +26,7 @@ under the License. </div> <div> <#assign oldrevision = result.revision?number - 1 > - <br/><h3>The differences between revisions: ${oldrevision?if_exists} and ${result.revision?if_exists} </h3> + <br/><h3>The differences between revisions: ${oldrevision!} and ${result.revision!} </h3> <br/><pre>${result.diffMessage}</pre> </div> </#if> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/Login.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/Login.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/Login.ftl (original) +++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/Login.ftl Sat Aug 16 08:40:28 2014 @@ -17,11 +17,11 @@ specific language governing permissions under the License. --> -<#if requestAttributes.uiLabelMap?exists> +<#if requestAttributes.uiLabelMap??> <#assign uiLabelMap = requestAttributes.uiLabelMap> </#if> -<#assign previousParams = sessionAttributes._PREVIOUS_PARAMS_?if_exists> +<#assign previousParams = sessionAttributes._PREVIOUS_PARAMS_!> <#if previousParams?has_content> <#assign previousParams = "?" + previousParams> </#if> @@ -38,7 +38,7 @@ under the License. <h3>${uiLabelMap.CommonRegistered}</h3> </div> <div class="screenlet-body"> - <form method="post" action="<@ofbizUrl>Login${previousParams?if_exists}</@ofbizUrl>" name="loginform"> + <form method="post" action="<@ofbizUrl>Login${previousParams!}</@ofbizUrl>" name="loginform"> <table class="basic-table" cellspacing="0"> <tr> <td class="label">${uiLabelMap.CommonUsername}</td> Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ShowCart.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ShowCart.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ShowCart.ftl (original) +++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ShowCart.ftl Sat Aug 16 08:40:28 2014 @@ -35,7 +35,7 @@ under the License. <tr> <td>${uiLabelMap.WebPosTransactionId}</td> <td><b>${transactionId?default("NA")}</b></td> - <td>${(paymentCash.get("description", locale))?if_exists}</td> + <td>${(paymentCash.get("description", locale))!}</td> <td align="right"><b><@ofbizCurrency amount=cashAmount isoCode=shoppingCart.getCurrency()/></b></td> <td>${uiLabelMap.WebPosTotalItemSubTotal}</td> <td align="right"><b><@ofbizCurrency amount=shoppingCart.getDisplaySubTotal() isoCode=shoppingCart.getCurrency()/></b></td> @@ -43,7 +43,7 @@ under the License. <tr> <td>${uiLabelMap.WebPosDrawer}</td> <td><b>${drawerNumber?default(0)}</b></td> - <td>${(paymentCheck.get("description", locale))?if_exists}</td> + <td>${(paymentCheck.get("description", locale))!}</td> <td align="right"><b><@ofbizCurrency amount=checkAmount isoCode=shoppingCart.getCurrency()/></b></td> <td>${uiLabelMap.WebPosTotalPromotions}</td> <td align="right"><b><@ofbizCurrency amount=shoppingCart.getOrderOtherAdjustmentTotal() isoCode=shoppingCart.getCurrency()/></b></td> @@ -51,7 +51,7 @@ under the License. <tr> <td>${uiLabelMap.WebPosTerminal}</td> <td><b><#if isOpen>${uiLabelMap.WebPosTerminalOpen}<#else>${uiLabelMap.WebPosTerminalClose}</#if></b></td> - <td>${(paymentGift.get("description", locale))?if_exists}</td> + <td>${(paymentGift.get("description", locale))!}</td> <td align="right"><b><@ofbizCurrency amount=giftAmount isoCode=shoppingCart.getCurrency()/></b></td> <td>${uiLabelMap.WebPosTotalSalesTax}</td> <td align="right"><b><@ofbizCurrency amount=shoppingCart.getTotalSalesTax() isoCode=shoppingCart.getCurrency()/></b></td> @@ -59,7 +59,7 @@ under the License. <tr> <td></td> <td></td> - <td>${(paymentCredit.get("description", locale))?if_exists}</td> + <td>${(paymentCredit.get("description", locale))!}</td> <td align="right"><b><@ofbizCurrency amount=creditAmount isoCode=shoppingCart.getCurrency()/></b></td> <td>${uiLabelMap.WebPosTotalShipping}</td> <td align="right"><b><@ofbizCurrency amount=shoppingCart.getTotalShipping() isoCode=shoppingCart.getCurrency()/></b></td> @@ -96,24 +96,24 @@ under the License. <tr id="cartLine${cartLineIndex}" <#if alt_row>class="pos-cart-even"<#else>class="pos-cart-odd"</#if>> <td> <div> - <#if cartLine.getProductId()?exists> + <#if cartLine.getProductId()??> <#-- product item --> <#-- start code to display a small image of the product --> - <#if cartLine.getParentProductId()?exists> + <#if cartLine.getParentProductId()??> <#assign parentProductId = cartLine.getParentProductId()/> <#else> <#assign parentProductId = cartLine.getProductId()/> </#if> - <#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher)?if_exists> + <#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher)!> <#if !smallImageUrl?string?has_content><#assign smallImageUrl = "/images/defaultImage.jpg"></#if> <#if smallImageUrl?string?has_content> - <img src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix?if_exists}${smallImageUrl}</@ofbizContentUrl>" align="left" class="cssImgSmall" /> + <img src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix!}${smallImageUrl}</@ofbizContentUrl>" align="left" class="cssImgSmall" /> </#if> <#-- end code to display a small image of the product --> - ${cartLine.getProductId()} - ${cartLine.getName()?if_exists} : ${cartLine.getDescription()?if_exists} + ${cartLine.getProductId()} - ${cartLine.getName()!} : ${cartLine.getDescription()!} <#else> <#-- this is a non-product item --> - <b>${cartLine.getItemTypeDescription()?if_exists}</b> : ${cartLine.getName()?if_exists} + <b>${cartLine.getItemTypeDescription()!}</b> : ${cartLine.getName()!} </#if> </div> </td> Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ShowCartItemSelected.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ShowCartItemSelected.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ShowCartItemSelected.ftl (original) +++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/cart/ShowCartItemSelected.ftl Sat Aug 16 08:40:28 2014 @@ -16,22 +16,22 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<#assign focusOnQuantity = requestParameters.focusOnQuantity?if_exists/> -<#assign cartLineIndex = requestParameters.cartLineIndex?if_exists/> -<#if cartLineIndex?exists && cartLineIndex?has_content> +<#assign focusOnQuantity = requestParameters.focusOnQuantity!/> +<#assign cartLineIndex = requestParameters.cartLineIndex!/> +<#if cartLineIndex?? && cartLineIndex?has_content> <#assign isInteger = Static["org.ofbiz.base.util.UtilValidate"].isInteger(cartLineIndex)> <#if isInteger> <#assign idx = cartLineIndex?number> - <#assign cartLine = shoppingCart.findCartItem(idx)?if_exists> - <#if cartLine?exists && cartLine?has_content> - <#if cartLine.getProductId()?exists> - <#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher)?if_exists> + <#assign cartLine = shoppingCart.findCartItem(idx)!> + <#if cartLine?? && cartLine?has_content> + <#if cartLine.getProductId()??> + <#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher)!> <#if !smallImageUrl?string?has_content> <#assign smallImageUrl = "/images/defaultImage.jpg"> </#if> <#if smallImageUrl?string?has_content> <div id="CartItemSelectedLeft"> - <img src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix?if_exists}${smallImageUrl}</@ofbizContentUrl>" align="left" class="cssImgSmall" /> + <img src="<@ofbizContentUrl>${requestAttributes.contentPathPrefix!}${smallImageUrl}</@ofbizContentUrl>" align="left" class="cssImgSmall" /> </div> </#if> <div id="CartItemSelectedRight"> @@ -49,7 +49,7 @@ under the License. <#else> <div id="CartItemSelectedRight"> <#-- this is a non-product item --> - <b>${cartLine.getItemTypeDescription()?if_exists}</b> : ${cartLine.getName()?if_exists} + <b>${cartLine.getItemTypeDescription()!}</b> : ${cartLine.getName()!} </#if> <br/> <b>${uiLabelMap.CommonQuantity}</b> Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/catalog/CategoryDetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/catalog/CategoryDetail.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/catalog/CategoryDetail.ftl (original) +++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/catalog/CategoryDetail.ftl Sat Aug 16 08:40:28 2014 @@ -16,21 +16,21 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<#if productCategoryMembers?exists> +<#if productCategoryMembers??> <table> <#assign numButton = 1/> <#assign cell = 0/> <tr> <#list productCategoryMembers as productCategoryMember> - <#assign product = productCategoryMember.getRelatedOne("Product", false)?if_exists> - <#if product?exists && product?has_content> - <#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(product, "SMALL_IMAGE_URL", locale, dispatcher)?if_exists /> + <#assign product = productCategoryMember.getRelatedOne("Product", false)!> + <#if product?? && product?has_content> + <#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(product, "SMALL_IMAGE_URL", locale, dispatcher)! /> <#if !smallImageUrl?string?has_content> <#assign smallImageUrl = "/images/defaultImage.jpg"> </#if> - <#assign productName = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(product, "PRODUCT_NAME", locale, dispatcher)?if_exists /> + <#assign productName = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(product, "PRODUCT_NAME", locale, dispatcher)! /> <#if !productName?string?has_content> - <#assign productName = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(product, "DESCRIPTION", locale, dispatcher)?if_exists /> + <#assign productName = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(product, "DESCRIPTION", locale, dispatcher)! /> </#if> <#assign addItemLink = "javascript:addItem('" + product.productId + "', '1', 'Y');"> <td> Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/catalog/SideDeepCategory.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/catalog/SideDeepCategory.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/catalog/SideDeepCategory.ftl (original) +++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/catalog/SideDeepCategory.ftl Sat Aug 16 08:40:28 2014 @@ -17,22 +17,22 @@ specific language governing permissions under the License. --> <#-- variable setup and worker calls --> -<#if (requestAttributes.topLevelList)?exists><#assign topLevelList = requestAttributes.topLevelList></#if> -<#if (requestAttributes.curCategoryId)?exists><#assign curCategoryId = requestAttributes.curCategoryId></#if> +<#if (requestAttributes.topLevelList)??><#assign topLevelList = requestAttributes.topLevelList></#if> +<#if (requestAttributes.curCategoryId)??><#assign curCategoryId = requestAttributes.curCategoryId></#if> <#-- looping macro --> <#macro categoryList parentCategory category wrapInBox> - <#if catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?exists> + <#if catContentWrappers?? && catContentWrappers[category.productCategoryId]?? && catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")??> <#assign categoryName = catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")> <#else> - <#assign categoryName = category.categoryName?if_exists> + <#assign categoryName = category.categoryName!> </#if> - <#if catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("DESCRIPTION")?exists> + <#if catContentWrappers?? && catContentWrappers[category.productCategoryId]?? && catContentWrappers[category.productCategoryId].get("DESCRIPTION")??> <#assign categoryDescription = catContentWrappers[category.productCategoryId].get("DESCRIPTION")> <#else> - <#assign categoryDescription = category.description?if_exists> + <#assign categoryDescription = category.description!> </#if> - <#if curCategoryId?exists && curCategoryId == category.productCategoryId> + <#if curCategoryId?? && curCategoryId == category.productCategoryId> <#assign browseCategoryButtonClass = "browsecategorybuttondisabled"> <#else> <#assign browseCategoryButtonClass = "browsecategorybutton"> @@ -51,9 +51,9 @@ under the License. </#if> <#assign categoryUrl = "javascript:selectCategory('" + category.productCategoryId + "');"/> <a href="${categoryUrl}" class="${browseCategoryButtonClass}"><#if categoryName?has_content>${categoryName}<#else>${categoryDescription?default("")}</#if></a> - <#if (Static["org.ofbiz.product.category.CategoryWorker"].checkTrailItem(request, category.getString("productCategoryId"))) || (curCategoryId?exists && curCategoryId == category.productCategoryId)> + <#if (Static["org.ofbiz.product.category.CategoryWorker"].checkTrailItem(request, category.getString("productCategoryId"))) || (curCategoryId?? && curCategoryId == category.productCategoryId)> <#local subCatList = Static["org.ofbiz.product.category.CategoryWorker"].getRelatedCategoriesRet(request, "subCatList", category.getString("productCategoryId"), true)> - <#if subCatList?exists> + <#if subCatList??> <#list subCatList as subCat> <ol class="browsecategorylist"> <@categoryList parentCategory=category category=subCat wrapInBox="N"/> Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/includes/Header.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/includes/Header.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/includes/Header.ftl (original) +++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/includes/Header.ftl Sat Aug 16 08:40:28 2014 @@ -21,7 +21,7 @@ under the License. <#-- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> --> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <title><#if title?has_content>${title}<#elseif titleProperty?has_content>${uiLabelMap.get(titleProperty)}</#if>: ${(productStore.storeName)?if_exists}</title> + <title><#if title?has_content>${title}<#elseif titleProperty?has_content>${uiLabelMap.get(titleProperty)}</#if>: ${(productStore.storeName)!}</title> <#if layoutSettings.shortcutIcon?has_content> <link rel="shortcut icon" href="<@ofbizContentUrl>${layoutSettings.shortcutIcon}</@ofbizContentUrl>" /> </#if> @@ -38,18 +38,18 @@ under the License. </#list> </#if> <#-- Append CSS for catalog --> - <#if catalogStyleSheet?exists> + <#if catalogStyleSheet??> <link rel="stylesheet" href="${catalogStyleSheet}" type="text/css"/> </#if> <#-- Append CSS for tracking codes --> - <#if sessionAttributes.overrideCss?exists> + <#if sessionAttributes.overrideCss??> <link rel="stylesheet" href="${sessionAttributes.overrideCss}" type="text/css"/> </#if> <#-- Meta tags if defined by the page action --> - <#if metaDescription?exists> + <#if metaDescription??> <meta name="description" content="${metaDescription}"/> </#if> - <#if metaKeywords?exists> + <#if metaKeywords??> <meta name="keywords" content="${metaKeywords}"/> </#if> </head> Modified: ofbiz/trunk/specialpurpose/webpos/webapp/webpos/includes/Messages.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/includes/Messages.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/includes/Messages.ftl (original) +++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/includes/Messages.ftl Sat Aug 16 08:40:28 2014 @@ -19,20 +19,20 @@ under the License. <#if requestAttributes.errorMessageList?has_content><#assign errorMessageList=requestAttributes.errorMessageList></#if> <#if requestAttributes.eventMessageList?has_content><#assign eventMessageList=requestAttributes.eventMessageList></#if> -<#if requestAttributes.serviceValidationException?exists><#assign serviceValidationException = requestAttributes.serviceValidationException></#if> +<#if requestAttributes.serviceValidationException??><#assign serviceValidationException = requestAttributes.serviceValidationException></#if> <#if requestAttributes.uiLabelMap?has_content><#assign uiLabelMap = requestAttributes.uiLabelMap></#if> <#if !errorMessage?has_content> - <#assign errorMessage = requestAttributes._ERROR_MESSAGE_?if_exists> + <#assign errorMessage = requestAttributes._ERROR_MESSAGE_!> </#if> <#if !errorMessageList?has_content> - <#assign errorMessageList = requestAttributes._ERROR_MESSAGE_LIST_?if_exists> + <#assign errorMessageList = requestAttributes._ERROR_MESSAGE_LIST_!> </#if> <#if !eventMessage?has_content> - <#assign eventMessage = requestAttributes._EVENT_MESSAGE_?if_exists> + <#assign eventMessage = requestAttributes._EVENT_MESSAGE_!> </#if> <#if !eventMessageList?has_content> - <#assign eventMessageList = requestAttributes._EVENT_MESSAGE_LIST_?if_exists> + <#assign eventMessageList = requestAttributes._EVENT_MESSAGE_LIST_!> </#if> <#-- display the error messages --> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |