svn commit: r1618554 [15/38] - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1618554 [15/38] - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/profileblocks/mytasks.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/profileblocks/mytasks.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/profileblocks/mytasks.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/profileblocks/mytasks.ftl Mon Aug 18 07:42:27 2014 @@ -39,9 +39,9 @@ under the License. <#assign alt_row = false> <#list tasks as workEffort> <tr<#if alt_row> class="alternate-row"</#if>> - <td>${(workEffort.estimatedStartDate.toString())?if_exists}</td> - <td>${workEffort.priority?if_exists}</td> - <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId")), true).get("description",locale))?if_exists}</td> + <td>${(workEffort.estimatedStartDate.toString())!}</td> + <td>${workEffort.priority!}</td> + <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId")), true).get("description",locale))!}</td> <td><a href="<@ofbizContentUrl>/workeffort/control/WorkEffortSummary?workEffortId=${workEffort.workEffortId}</@ofbizContentUrl>">${workEffort.workEffortName}</a></td> <td class="button-col"><a href="<@ofbizContentUrl>/workeffort/control/WorkEffortSummary?workEffortId=${workEffort.workEffortId}</@ofbizContentUrl>">${workEffort.workEffortId}</a></td> </tr> @@ -64,10 +64,10 @@ under the License. <#assign alt_row = false> <#list activities as workEffort> <tr<#if alt_row> class="alternate-row"</#if>> - <td>${(workEffort.estimatedStartDate.toString())?if_exists}</td> - <td>${workEffort.priority?if_exists}</td> - <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId")), true).get("description",locale))?if_exists}</td> - <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("statusId")), true).get("description",locale))?if_exists}</td> + <td>${(workEffort.estimatedStartDate.toString())!}</td> + <td>${workEffort.priority!}</td> + <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId")), true).get("description",locale))!}</td> + <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("statusId")), true).get("description",locale))!}</td> <#-- <td>${workEffort.partyId}</td> --> <td>${workEffort.roleTypeId}</td> <td><a href="<@ofbizContentUrl>/workeffort/control/WorkEffortSummary?workEffortId=${workEffort.workEffortId}</@ofbizContentUrl>">${workEffort.workEffortName}</a></td> @@ -93,10 +93,10 @@ under the License. <#assign alt_row = false> <#list roleActivities as workEffort> <tr<#if alt_row> class="alternate-row"</#if>> - <td>${(workEffort.estimatedStartDate.toString())?if_exists}</td> - <td>${workEffort.priority?if_exists}</td> - <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId")), true).get("description",locale))?if_exists}</td> - <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("statusId")), true).get("description",locale))?if_exists}</td> + <td>${(workEffort.estimatedStartDate.toString())!}</td> + <td>${workEffort.priority!}</td> + <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId")), true).get("description",locale))!}</td> + <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("statusId")), true).get("description",locale))!}</td> <#-- <td>${workEffort.partyId}</td> --> <td>${workEffort.roleTypeId}</td> <td><a href="<@ofbizContentUrl>/workeffort/control/WorkEffortSummary?workEffortId=${workEffort.workEffortId}</@ofbizContentUrl>">${workEffort.workEffortName}</a></td> @@ -122,10 +122,10 @@ under the License. <#assign alt_row = false> <#list groupActivities as workEffort> <tr<#if alt_row> class="alternate-row"</#if>> - <td>${(workEffort.estimatedStartDate.toString())?if_exists}</td> - <td>${workEffort.priority?if_exists}</td> - <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId")), true).get("description",locale))?if_exists}</td> - <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("statusId")), true).get("description",locale))?if_exists}</td> + <td>${(workEffort.estimatedStartDate.toString())!}</td> + <td>${workEffort.priority!}</td> + <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId")), true).get("description",locale))!}</td> + <td>${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("statusId")), true).get("description",locale))!}</td> <td>${workEffort.groupPartyId}</td> <#-- <td>${workEffort.roleTypeId}</td> --> <td><a href="<@ofbizContentUrl>/workeffort/control/WorkEffortSummary?workEffortId=${workEffort.workEffortId}</@ofbizContentUrl>">${workEffort.workEffortName}</a></td> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/security/ViewCertificate.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/security/ViewCertificate.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/security/ViewCertificate.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/security/ViewCertificate.ftl Mon Aug 18 07:42:27 2014 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> -<#assign components = Static["org.ofbiz.base.component.ComponentConfig"].getAllComponents()?if_exists/> +<#assign components = Static["org.ofbiz.base.component.ComponentConfig"].getAllComponents()!/> <#if (requestParameters.certString?has_content)> <#assign cert = Static["org.ofbiz.base.util.KeyStoreUtil"].pemToCert(requestParameters.certString)/> </#if> @@ -55,7 +55,7 @@ under the License. <td> </td> </tr> <#list components as component> - <#assign keystores = component.getKeystoreInfos()?if_exists/> + <#assign keystores = component.getKeystoreInfos()!/> <#list keystores as store> <#if (store.isTrustStore())> <tr> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/visit/showvisits.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/visit/showvisits.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/visit/showvisits.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/visit/showvisits.ftl Mon Aug 18 07:42:27 2014 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> <div class="screenlet"> - <#if partyId?exists> + <#if partyId??> <#assign title = uiLabelMap.PartyParty> <#else> <#assign title = uiLabelMap.PartyActive> @@ -25,9 +25,9 @@ under the License. <div class="screenlet-title-bar"> <ul> <li class="h3">${title} ${uiLabelMap.PartyVisitListing}</li> - <#if !partyId?exists && showAll?lower_case == "true"> + <#if !partyId?? && showAll?lower_case == "true"> <li><a href="<@ofbizUrl>showvisits?showAll=false</@ofbizUrl>">${uiLabelMap.PartyShowActive}</a></li> - <#elseif !partyId?exists> + <#elseif !partyId??> <li><a href="<@ofbizUrl>showvisits?showAll=true</@ofbizUrl>">${uiLabelMap.PartyShowAll}</a></li> </#if> </ul> @@ -66,14 +66,14 @@ under the License. <#list visitList as visitObj> <tr<#if alt_row> class="alternate-row"</#if>> <td class="button-col"><a href="<@ofbizUrl>visitdetail?visitId=${visitObj.visitId}</@ofbizUrl>">${visitObj.visitId}</a></td> - <td>${visitObj.visitorId?if_exists}</td> - <td class="button-col"><a href="<@ofbizUrl>viewprofile?partyId=${visitObj.partyId?if_exists}</@ofbizUrl>">${visitObj.partyId?if_exists}</a></td> - <td>${visitObj.userLoginId?if_exists}</td> - <td>${visitObj.userCreated?if_exists}</td> - <td>${visitObj.webappName?if_exists}</td> - <td>${visitObj.clientIpAddress?if_exists}</td> - <td>${(visitObj.fromDate?string)?if_exists}</td> - <td>${(visitObj.thruDate?string)?if_exists}</td> + <td>${visitObj.visitorId!}</td> + <td class="button-col"><a href="<@ofbizUrl>viewprofile?partyId=${visitObj.partyId!}</@ofbizUrl>">${visitObj.partyId!}</a></td> + <td>${visitObj.userLoginId!}</td> + <td>${visitObj.userCreated!}</td> + <td>${visitObj.webappName!}</td> + <td>${visitObj.clientIpAddress!}</td> + <td>${(visitObj.fromDate?string)!}</td> + <td>${(visitObj.thruDate?string)!}</td> </tr> <#assign alt_row = !alt_row> </#list> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/visit/visitdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/visit/visitdetail.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/visit/visitdetail.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/visit/visitdetail.ftl Mon Aug 18 07:42:27 2014 @@ -29,7 +29,7 @@ under the License. <table class="basic-table" cellspacing="0"> <tr> <td class="label">${uiLabelMap.PartyVisitIDSessionID}</td> - <td>${visit.visitId?if_exists} / ${visit.sessionId?if_exists}</td> + <td>${visit.visitId!} / ${visit.sessionId!}</td> </tr> <tr> <td class="label">${uiLabelMap.PartyVisitorId}</td> @@ -37,51 +37,51 @@ under the License. </tr> <tr> <td class="label">${uiLabelMap.PartyPartyIDUserLoginID}</td> - <td><a href="<@ofbizUrl>viewprofile?partyId=${visit.partyId?if_exists}</@ofbizUrl>">${visit.partyId?if_exists}</a> / <a href="<@ofbizUrl>viewprofile?partyId=${visit.partyId?if_exists}</@ofbizUrl>">${visit.userLoginId?if_exists}</a></td> + <td><a href="<@ofbizUrl>viewprofile?partyId=${visit.partyId!}</@ofbizUrl>">${visit.partyId!}</a> / <a href="<@ofbizUrl>viewprofile?partyId=${visit.partyId!}</@ofbizUrl>">${visit.userLoginId!}</a></td> </tr> <tr> <td class="label">${uiLabelMap.PartyUserCreated}</td> - <td>${visit.userCreated?if_exists}</td> + <td>${visit.userCreated!}</td> </tr> <tr> <td class="label">${uiLabelMap.PartyWebApp}</td> - <td>${visit.webappName?if_exists}</td> + <td>${visit.webappName!}</td> </tr> <tr> <td class="label">${uiLabelMap.PartyServer}</td> - <td><a href="http://uptime.netcraft.com/up/graph/?site=${visit.serverIpAddress?if_exists}" target="_blank">${visit.serverIpAddress?if_exists}</a> / <a href="http://uptime.netcraft.com/up/graph/?site=${visit.serverIpAddress?if_exists}" target="_blank">${visit.serverHostName?if_exists}</a></td> + <td><a href="http://uptime.netcraft.com/up/graph/?site=${visit.serverIpAddress!}" target="_blank">${visit.serverIpAddress!}</a> / <a href="http://uptime.netcraft.com/up/graph/?site=${visit.serverIpAddress!}" target="_blank">${visit.serverHostName!}</a></td> </tr> <tr> <td class="label">${uiLabelMap.PartyClient}</td> - <td><a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=${visit.clientIpAddress?if_exists}" target="_blank">${visit.clientIpAddress?if_exists}</a> / <a href="http://www.networksolutions.com/cgi-bin/whois/whois?STRING=${visit.clientHostName?if_exists}&SearchType=do" target="_blank">${visit.clientHostName?if_exists}</a></td> + <td><a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=${visit.clientIpAddress!}" target="_blank">${visit.clientIpAddress!}</a> / <a href="http://www.networksolutions.com/cgi-bin/whois/whois?STRING=${visit.clientHostName!}&SearchType=do" target="_blank">${visit.clientHostName!}</a></td> </tr> <tr> <td class="label">${uiLabelMap.PartyClientUser}</td> - <td>${visit.clientUser?if_exists}</td> + <td>${visit.clientUser!}</td> </tr> <tr> <td class="label">${uiLabelMap.PartyInitialLocale}</td> - <td>${visit.initialLocale?if_exists}</td> + <td>${visit.initialLocale!}</td> </tr> <tr> <td class="label">${uiLabelMap.PartyInitialRequest}</td> - <td><a href="${visit.initialRequest?if_exists}" >${visit.initialRequest?if_exists}</a></td> + <td><a href="${visit.initialRequest!}" >${visit.initialRequest!}</a></td> </tr> <tr> <td class="label">${uiLabelMap.PartyInitialReferer}</td> - <td><a href="${visit.initialReferrer?if_exists}" >${visit.initialReferrer?if_exists}</a></td> + <td><a href="${visit.initialReferrer!}" >${visit.initialReferrer!}</a></td> </tr> <tr> <td class="label">${uiLabelMap.PartyInitialUserAgent}</td> - <td>${visit.initialUserAgent?if_exists}</td> + <td>${visit.initialUserAgent!}</td> </tr> <tr> <td class="label">${uiLabelMap.PartyCookie}</td> - <td>${visit.cookie?if_exists}</td> + <td>${visit.cookie!}</td> </tr> <tr> <td class="label">${uiLabelMap.CommonFromDateThruDate}</td> - <td>${(visit.fromDate?string)?if_exists} / ${(visit.thruDate?string)?default(uiLabelMap.PartyStillActive)}</td> + <td>${(visit.fromDate?string)!} / ${(visit.thruDate?string)?default(uiLabelMap.PartyStillActive)}</td> </tr> </table> </div> @@ -123,22 +123,22 @@ under the License. <#assign alt_row = false> <#if serverHits?has_content> <#list serverHits[lowIndex..highIndex-1] as hit> - <#assign serverHitType = hit.getRelatedOne("ServerHitType", false)?if_exists> + <#assign serverHitType = hit.getRelatedOne("ServerHitType", false)!> <tr<#if alt_row> class="alternate-row"</#if>> - <td>${hit.contentId?if_exists}</td> - <td>${serverHitType.get("description",locale)?if_exists}</td> + <td>${hit.contentId!}</td> + <td>${serverHitType.get("description",locale)!}</td> <td> ${hit.numOfBytes?default("?")}</td> - <td>${hit.hitStartDateTime?string?if_exists}</td> - <td>${hit.runningTimeMillis?if_exists}</td> + <td>${hit.hitStartDateTime?string!}</td> + <td>${hit.runningTimeMillis!}</td> <td> - <#assign url = (hit.requestUrl)?if_exists> - <#if url?exists> + <#assign url = (hit.requestUrl)!> + <#if url??> <#assign len = url?length> <#if 45 < len> <#assign url = url[0..45] + "..."> </#if> </#if> - <a href="${hit.requestUrl?if_exists}" target="_blank">${url}</a> + <a href="${hit.requestUrl!}" target="_blank">${url}</a> </td> </tr> <#-- toggle the row color --> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/widget/partymgr/ProfileScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/widget/partymgr/ProfileScreens.xml?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/widget/partymgr/ProfileScreens.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/widget/partymgr/ProfileScreens.xml Mon Aug 18 07:42:27 2014 @@ -207,9 +207,9 @@ <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <set field="partyId" from-field="parameters.partyId" default-value="${userLogin.partyId}"/> <entity-one entity-name="Party" value-field="party"/> - <entity-and entity-name="PartyIcsAvsOverride" list="avsOverride"> - <field-map field-name="partyId" from-field="partyId"/> - </entity-and> + <entity-one entity-name="PartyIcsAvsOverride" value-field="avsOverride"> + <field-map field-name="partyId"/> + </entity-one> </actions> <widgets> <platform-specific> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/ProductUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/ProductUiLabels.xml?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/ProductUiLabels.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/ProductUiLabels.xml Mon Aug 18 07:42:27 2014 @@ -10329,6 +10329,9 @@ <value xml:lang="zh">æ¹éæ·»å ä¾è´§å产å</value> <value xml:lang="zh_TW">æ¹éæ·»å ä¾è²¨åç¢å</value> </property> + <property key="PageTitleLookupCostComponentCalc"> + <value xml:lang="en">Lookup Cost Component Calculation</value> + </property> <property key="PageTitleLookupFacility"> <value xml:lang="de">Einrichtung nachschlagen</value> <value xml:lang="en">Lookup Facility</value> @@ -14314,6 +14317,12 @@ <value xml:lang="zh">æ产ååç±»æåå¤å¶å°å¦ä¸ä¸ªåç±»</value> <value xml:lang="zh_TW">æç¢ååé¡æå¡è¤å¶å°å¦ä¸ååé¡</value> </property> + <property key="ProductCostComponentCalcId"> + <value xml:lang="en">Cost Component Calc Id</value> + </property> + <property key="ProductCostGlAccountTypeId"> + <value xml:lang="en">Cost Gl Account Type Id</value> + </property> <property key="ProductCostPrice"> <value xml:lang="de">Kosten Preis</value> <value xml:lang="en">Cost Price</value> @@ -21907,6 +21916,9 @@ <value xml:lang="zh">å¶é åç»çæ è¯ </value> <value xml:lang="zh_TW">製é å給çID </value> </property> + <property key="ProductOffsettingGlAccountTypeId"> + <value xml:lang="en">Off Setting GL Account Type Id</value> + </property> <property key="ProductOneInventoryFacility"> <value xml:lang="de">Eine Lagereinrichtung</value> <value xml:lang="en">One Inventory Facility</value> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Mon Aug 18 07:42:27 2014 @@ -1339,6 +1339,13 @@ under the License. </simple-method> <simple-method method-name="quickDropShipOrder" short-description="Create and complete a drop shipment for a ship group"> + <entity-one entity-name="OrderHeader" value-field="orderHeader"/> + <if-compare field="orderHeader.statusId" operator="equals" value="ORDER_CREATED"> + <add-error> + <fail-property resource="OrderErrorUiLabels" property="OrderApproveOrderBeforeQuickDropShip"/> + </add-error> + <check-errors/> + </if-compare> <set from-field="parameters.orderId" field="shipmentContext.primaryOrderId"/> <set from-field="parameters.shipGroupSeqId" field="shipmentContext.primaryShipGroupSeqId"/> <set value="PURCH_SHIP_CREATED" field="shipmentContext.statusId"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/image/ScaleImage.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/image/ScaleImage.java?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/image/ScaleImage.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/image/ScaleImage.java Mon Aug 18 07:42:27 2014 @@ -38,6 +38,8 @@ import org.ofbiz.base.util.UtilPropertie import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.string.FlexibleStringExpander; import org.ofbiz.common.image.ImageTransform; +import org.ofbiz.entity.Delegator; +import org.ofbiz.entity.util.EntityUtilProperties; import org.ofbiz.service.ServiceUtil; /** @@ -104,8 +106,8 @@ public class ScaleImage { index = filenameToUse.lastIndexOf("."); String imgExtension = filenameToUse.substring(index + 1); // paths - String imageServerPath = FlexibleStringExpander.expandString(UtilProperties.getPropertyValue("catalog", "image.server.path"), context); - String imageUrlPrefix = UtilProperties.getPropertyValue("catalog", "image.url.prefix"); + String imageServerPath = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.server.path", (Delegator)context.get("delegator")), context); + String imageUrlPrefix = EntityUtilProperties.getPropertyValue("catalog", "image.url.prefix", (Delegator)context.get("delegator")); FlexibleStringExpander filenameExpander; String fileLocation = null; @@ -281,8 +283,8 @@ public class ScaleImage { String imgExtension = filenameToUse.substring(index + 1); // paths String mainFilenameFormat = UtilProperties.getPropertyValue("catalog", "image.filename.format"); - String imageServerPath = FlexibleStringExpander.expandString(UtilProperties.getPropertyValue("catalog", "image.server.path"), context); - String imageUrlPrefix = UtilProperties.getPropertyValue("catalog", "image.url.prefix"); + String imageServerPath = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.server.path", (Delegator)context.get("delegator")), context); + String imageUrlPrefix = EntityUtilProperties.getPropertyValue("catalog", "image.url.prefix",(Delegator)context.get("delegator")); String id = null; String type = null; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/product/ProductServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/product/ProductServices.java?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/product/ProductServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/product/ProductServices.java Mon Aug 18 07:42:27 2014 @@ -55,6 +55,7 @@ import org.ofbiz.entity.condition.Entity import org.ofbiz.entity.condition.EntityJoinOperator; import org.ofbiz.entity.condition.EntityOperator; import org.ofbiz.entity.util.EntityUtil; +import org.ofbiz.entity.util.EntityUtilProperties; import org.ofbiz.product.catalog.CatalogWorker; import org.ofbiz.product.category.CategoryWorker; import org.ofbiz.product.image.ScaleImage; @@ -983,8 +984,8 @@ public class ProductServices { if (UtilValidate.isNotEmpty(context.get("_uploadedFile_fileName"))) { String imageFilenameFormat = UtilProperties.getPropertyValue("catalog", "image.filename.additionalviewsize.format"); - String imageServerPath = FlexibleStringExpander.expandString(UtilProperties.getPropertyValue("catalog", "image.server.path"), context); - String imageUrlPrefix = UtilProperties.getPropertyValue("catalog", "image.url.prefix"); + String imageServerPath = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.server.path", delegator), context); + String imageUrlPrefix = EntityUtilProperties.getPropertyValue("catalog", "image.url.prefix", delegator); FlexibleStringExpander filenameExpander = FlexibleStringExpander.getInstance(imageFilenameFormat); String viewNumber = String.valueOf(productContentTypeId.charAt(productContentTypeId.length() - 1)); @@ -1075,7 +1076,10 @@ public class ProductServices { /* scale Image in different sizes */ Map<String, Object> resultResize = FastMap.newInstance(); try { - resultResize.putAll(ScaleImage.scaleImageInAllSize(context, filenameToUse, "additional", viewNumber)); + Map<String, Object>imageContext = FastMap.newInstance(); + imageContext.putAll(context); + imageContext.put("delegator", delegator); + resultResize.putAll(ScaleImage.scaleImageInAllSize(imageContext, filenameToUse, "additional", viewNumber)); } catch (IOException e) { Debug.logError(e, "Scale additional image in all different sizes is impossible : " + e.toString(), module); return ServiceUtil.returnError(UtilProperties.getMessage(resource, @@ -1274,8 +1278,8 @@ public class ProductServices { if (UtilValidate.isNotEmpty(context.get("_uploadedFile_fileName"))) { String imageFilenameFormat = UtilProperties.getPropertyValue("catalog", "image.filename.format"); - String imageServerPath = FlexibleStringExpander.expandString(UtilProperties.getPropertyValue("catalog", "image.server.path"), context); - String imageUrlPrefix = UtilProperties.getPropertyValue("catalog", "image.url.prefix"); + String imageServerPath = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.server.path",delegator), context); + String imageUrlPrefix = EntityUtilProperties.getPropertyValue("catalog", "image.url.prefix", delegator); FlexibleStringExpander filenameExpander = FlexibleStringExpander.getInstance(imageFilenameFormat); String id = productPromoId + "_Image_" + productPromoContentTypeId.charAt(productPromoContentTypeId.length() - 1); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java Mon Aug 18 07:42:27 2014 @@ -45,6 +45,7 @@ import org.ofbiz.entity.model.ModelEntit import org.ofbiz.entity.model.ModelKeyMap; import org.ofbiz.entity.util.EntityListIterator; import org.ofbiz.entity.util.EntityUtil; +import org.ofbiz.entity.util.EntityUtilProperties; import org.ofbiz.service.DispatchContext; import org.ofbiz.service.GenericServiceException; import org.ofbiz.service.LocalDispatcher; @@ -494,7 +495,7 @@ public class ProductUtilServices { if (UtilValidate.isEmpty(pattern)) { String imageFilenameFormat = UtilProperties.getPropertyValue("catalog", "image.filename.format"); - String imageUrlPrefix = UtilProperties.getPropertyValue("catalog", "image.url.prefix"); + String imageUrlPrefix = EntityUtilProperties.getPropertyValue("catalog", "image.url.prefix",delegator); pattern = imageUrlPrefix + "/" + imageFilenameFormat; } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java Mon Aug 18 07:42:27 2014 @@ -1183,11 +1183,8 @@ public class ShipmentServices { if (locale == null) { locale = Locale.getDefault(); } - ResourceBundleMapWrapper uiLabelMap = UtilProperties.getResourceBundleMap("EcommerceUiLabels", locale); - uiLabelMap.addBottomResourceBundle("OrderUiLabels"); - uiLabelMap.addBottomResourceBundle("CommonUiLabels"); - Map<String, Object> bodyParameters = UtilMisc.<String, Object>toMap("partyId", partyId, "shipmentId", shipmentId, "orderId", shipment.getString("primaryOrderId"), "userLogin", userLogin, "uiLabelMap", uiLabelMap, "locale", locale); + Map<String, Object> bodyParameters = UtilMisc.<String, Object>toMap("partyId", partyId, "shipmentId", shipmentId, "orderId", shipment.getString("primaryOrderId"), "userLogin", userLogin, "locale", locale); sendMap.put("bodyParameters", bodyParameters); sendMap.put("userLogin",userLogin); @@ -1196,7 +1193,7 @@ public class ShipmentServices { sendMap.put("sendFrom", productStoreEmail.get("fromAddress")); sendMap.put("sendCc", productStoreEmail.get("ccAddress")); sendMap.put("sendBcc", productStoreEmail.get("bccAddress")); - + if ((sendTo != null) && UtilValidate.isEmail(sendTo)) { sendMap.put("sendTo", sendTo); } else { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/templates/shipment/FedexShipRequestTemplate.xml.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/templates/shipment/FedexShipRequestTemplate.xml.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/templates/shipment/FedexShipRequestTemplate.xml.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/templates/shipment/FedexShipRequestTemplate.xml.ftl Mon Aug 18 07:42:27 2014 @@ -38,20 +38,20 @@ <CurrencyCode>${CurrencyCode?xml}</CurrencyCode> <Origin> <Contact> - <#if OriginContactPersonName?exists> + <#if OriginContactPersonName??> <PersonName>${OriginContactPersonName?xml}</PersonName> - <#elseif OriginContactCompanyName?exists> + <#elseif OriginContactCompanyName??> <CompanyName>${OriginContactCompanyName?xml}</CompanyName> </#if> <PhoneNumber>${OriginContactPhoneNumber?xml}</PhoneNumber> </Contact> <Address> <Line1>${OriginAddressLine1?xml}</Line1> - <#if OriginAddressLine2?exists> + <#if OriginAddressLine2??> <Line2>${OriginAddressLine2?xml}</Line2> </#if> <City>${OriginAddressCity?xml}</City> - <#if OriginAddressStateOrProvinceCode?exists> + <#if OriginAddressStateOrProvinceCode??> <StateOrProvinceCode>${OriginAddressStateOrProvinceCode?xml}</StateOrProvinceCode> </#if> <PostalCode>${OriginAddressPostalCode?xml}</PostalCode> @@ -60,20 +60,20 @@ </Origin> <Destination> <Contact> - <#if DestinationContactPersonName?exists> + <#if DestinationContactPersonName??> <PersonName>${DestinationContactPersonName?xml}</PersonName> - <#elseif DestinationContactCompanyName?exists> + <#elseif DestinationContactCompanyName??> <CompanyName>${DestinationContactCompanyName?xml}</CompanyName> </#if> <PhoneNumber>${DestinationContactPhoneNumber?xml}</PhoneNumber> </Contact> <Address> <Line1>${DestinationAddressLine1?xml}</Line1> - <#if DestinationAddressLine2?exists> + <#if DestinationAddressLine2??> <Line2>${DestinationAddressLine2?xml}</Line2> </#if> <City>${DestinationAddressCity?xml}</City> - <#if DestinationAddressStateOrProvinceCode?exists> + <#if DestinationAddressStateOrProvinceCode??> <StateOrProvinceCode>${DestinationAddressStateOrProvinceCode?xml}</StateOrProvinceCode> </#if> <PostalCode>${DestinationAddressPostalCode?xml}</PostalCode> @@ -86,24 +86,24 @@ <ReferenceInfo> <CustomerReference>${CustomerReference?xml}</CustomerReference> </ReferenceInfo> - <#if DimensionsUnits?exists> + <#if DimensionsUnits??> <Dimensions> - <#if DimensionsLength?exists> + <#if DimensionsLength??> <Length>${DimensionsLength?xml}</Length> </#if> - <#if DimensionsWidth?exists> + <#if DimensionsWidth??> <Width>${DimensionsWidth?xml}</Width> </#if> - <#if DimensionsHeight?exists> + <#if DimensionsHeight??> <Height>${DimensionsHeight?xml}</Height> </#if> <Units>${DimensionsUnits?xml}</Units> </Dimensions> </#if> - <#if HomeDeliveryType?exists> + <#if HomeDeliveryType??> <HomeDelivery> <Type>${HomeDeliveryType?xml}</Type> - <#if HomeDeliveryDate?exists> + <#if HomeDeliveryDate??> <Date>${HomeDeliveryDate?string("yyyy-MM-dd")}</Date> </#if> <PhoneNumber>${DestinationContactPhoneNumber?xml}</PhoneNumber> @@ -113,7 +113,7 @@ <Type>${LabelType?xml}</Type> <ImageType>${LabelImageType?xml}</ImageType> </Label> - <#if HomeDeliveryType?exists> + <#if HomeDeliveryType??> <SpecialServices> <ResidentialDelivery>true</ResidentialDelivery> </SpecialServices> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/templates/shipment/FedexSubscriptionRequestTemplate.xml.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/templates/shipment/FedexSubscriptionRequestTemplate.xml.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/templates/shipment/FedexSubscriptionRequestTemplate.xml.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/templates/shipment/FedexSubscriptionRequestTemplate.xml.ftl Mon Aug 18 07:42:27 2014 @@ -30,21 +30,21 @@ <PersonName>${PersonName?xml}</PersonName> <CompanyName>${CompanyName?xml}</CompanyName> <PhoneNumber>${PhoneNumber?xml}</PhoneNumber> - <#if FaxNumber?exists> + <#if FaxNumber??> <FaxNumber>${FaxNumber?xml}</FaxNumber> </#if> - <#if EMailAddress?exists> + <#if EMailAddress??> <#-- Freemarker has a problem with the E-MailAddress tag name, so the opening and closing tags need to be wrapped in the noparse directive. --> <#noparse><E-MailAddress></#noparse>${EMailAddress?xml}<#noparse></E-MailAddress></#noparse> </#if> </Contact> <Address> <Line1>${Line1?xml}</Line1> - <#if Line2?exists> + <#if Line2??> <Line2>${Line2?xml}</Line2> </#if> <City>${City?xml}</City> - <#if StateOrProvinceCode?exists> + <#if StateOrProvinceCode??> <StateOrProvinceCode>${StateOrProvinceCode?xml}</StateOrProvinceCode> </#if> <PostalCode>${PostalCode?xml}</PostalCode> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategory.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategory.groovy?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategory.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategory.groovy Mon Aug 18 07:42:27 2014 @@ -19,6 +19,7 @@ import org.ofbiz.base.util.* import org.ofbiz.base.util.string.* +import org.ofbiz.entity.util.EntityUtilProperties if (productCategory) { context.productCategoryType = productCategory.getRelatedOne("ProductCategoryType", false); @@ -36,8 +37,8 @@ context.primaryParentCategory = primaryP // make the image file formats imageFilenameFormat = UtilProperties.getPropertyValue("catalog", "image.filename.format"); -imageServerPath = FlexibleStringExpander.expandString(UtilProperties.getPropertyValue("catalog", "image.server.path"), context); -imageUrlPrefix = UtilProperties.getPropertyValue("catalog", "image.url.prefix"); +imageServerPath = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.server.path", delegator), context); +imageUrlPrefix = EntityUtilProperties.getPropertyValue("catalog", "image.url.prefix",delegator); context.imageFilenameFormat = imageFilenameFormat; context.imageServerPath = imageServerPath; context.imageUrlPrefix = imageUrlPrefix; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy Mon Aug 18 07:42:27 2014 @@ -20,12 +20,13 @@ import org.ofbiz.base.util.* import org.ofbiz.base.util.string.* import org.ofbiz.entity.* +import org.ofbiz.entity.util.EntityUtilProperties; import org.ofbiz.widget.html.* // make the image file formats imageFilenameFormat = "configitems/${configItemId}"; -imageServerPath = FlexibleStringExpander.expandString(UtilProperties.getPropertyValue("catalog", "image.server.path"), context); -imageUrlPrefix = UtilProperties.getPropertyValue("catalog", "image.url.prefix"); +imageServerPath = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.server.path", delegator), context); +imageUrlPrefix = EntityUtilProperties.getPropertyValue("catalog", "image.url.prefix",delegator); context.imageFilenameFormat = imageFilenameFormat; context.imageServerPath = imageServerPath; context.imageUrlPrefix = imageUrlPrefix; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/ImageUpload.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/ImageUpload.groovy?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/ImageUpload.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/ImageUpload.groovy Mon Aug 18 07:42:27 2014 @@ -20,6 +20,7 @@ import org.ofbiz.entity.*; import org.ofbiz.base.util.*; import org.ofbiz.base.util.string.*; +import org.ofbiz.entity.util.EntityUtilProperties; import org.ofbiz.product.image.ScaleImage; import org.ofbiz.entity.condition.* @@ -27,8 +28,8 @@ context.nowTimestampString = UtilDateTim // make the image file formats imageFilenameFormat = UtilProperties.getPropertyValue('catalog', 'image.filename.format'); -imageServerPath = FlexibleStringExpander.expandString(UtilProperties.getPropertyValue("catalog", "image.server.path"), context); -imageUrlPrefix = UtilProperties.getPropertyValue('catalog', 'image.url.prefix'); +imageServerPath = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.server.path", delegator), context); +imageUrlPrefix = EntityUtilProperties.getPropertyValue('catalog', 'image.url.prefix',delegator); context.imageFilenameFormat = imageFilenameFormat; context.imageServerPath = imageServerPath; context.imageUrlPrefix = imageUrlPrefix; @@ -126,6 +127,7 @@ if (fileType) { // call scaleImageInAllSize if (fileType.equals("original")) { + context.delegator = delegator; result = ScaleImage.scaleImageInAllSize(context, filenameToUse, "main", "0"); if (result.containsKey("responseMessage") && result.get("responseMessage").equals("success")) { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/SetDefaultImage.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/SetDefaultImage.groovy?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/SetDefaultImage.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/imagemanagement/SetDefaultImage.groovy Mon Aug 18 07:42:27 2014 @@ -26,6 +26,7 @@ import javax.imageio.ImageIO; import org.ofbiz.entity.*; import org.ofbiz.entity.util.EntityUtil; +import org.ofbiz.entity.util.EntityUtilProperties; import org.ofbiz.base.util.*; import org.ofbiz.base.util.string.*; import org.ofbiz.product.image.ScaleImage; @@ -44,8 +45,8 @@ if (productContentList) { // make the image file formats imageFilenameFormat = UtilProperties.getPropertyValue('catalog', 'image.filename.format'); -imageServerPath = FlexibleStringExpander.expandString(UtilProperties.getPropertyValue("catalog", "image.server.path"), context); -imageUrlPrefix = UtilProperties.getPropertyValue('catalog', 'image.url.prefix'); +imageServerPath = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.server.path", delegator), context); +imageUrlPrefix = EntityUtilProperties.getPropertyValue('catalog', 'image.url.prefix',delegator); context.imageFilenameFormat = imageFilenameFormat; context.imageServerPath = imageServerPath; context.imageUrlPrefix = imageUrlPrefix; @@ -164,6 +165,7 @@ if (fileType) { // call scaleImageInAllSize if (fileType.equals("original")) { + context.delegator = delegator; result = ScaleImage.scaleImageInAllSize(context, filenameToUse, "main", "0"); if (result.containsKey("responseMessage") && result.get("responseMessage").equals("success")) { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContent.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContent.groovy?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContent.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContent.groovy Mon Aug 18 07:42:27 2014 @@ -20,14 +20,15 @@ import org.ofbiz.entity.*; import org.ofbiz.base.util.*; import org.ofbiz.base.util.string.*; +import org.ofbiz.entity.util.EntityUtilProperties; import org.ofbiz.product.image.ScaleImage; context.nowTimestampString = UtilDateTime.nowTimestamp().toString(); // make the image file formats imageFilenameFormat = UtilProperties.getPropertyValue('catalog', 'image.filename.format'); -imageServerPath = FlexibleStringExpander.expandString(UtilProperties.getPropertyValue("catalog", "image.server.path"), context); -imageUrlPrefix = UtilProperties.getPropertyValue('catalog', 'image.url.prefix'); +imageServerPath = FlexibleStringExpander.expandString(EntityUtilProperties.getPropertyValue("catalog", "image.server.path", delegator), context); +imageUrlPrefix = EntityUtilProperties.getPropertyValue('catalog', 'image.url.prefix',delegator); context.imageFilenameFormat = imageFilenameFormat; context.imageServerPath = imageServerPath; context.imageUrlPrefix = imageUrlPrefix; @@ -143,6 +144,7 @@ if (fileType) { // call scaleImageInAllSize if (fileType.equals("original")) { + context.delegator = delegator; result = ScaleImage.scaleImageInAllSize(context, filenameToUse, "main", "0"); if (result.containsKey("responseMessage") && result.get("responseMessage").equals("success")) { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/controller.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/controller.xml Mon Aug 18 07:42:27 2014 @@ -2974,6 +2974,7 @@ under the License. <request-map uri="LookupProductStore"><security auth="true" https="true"/><response name="success" type="view" value="LookupProductStore"/></request-map> <request-map uri="LookupFacilityLocation"><security auth="true" https="true"/><response name="success" type="view" value="LookupFacilityLocation"/></request-map> <request-map uri="LookupWorkEffort"><security https="true" auth="true"/><response name="success" type="view" value="LookupWorkEffort"/></request-map> + <request-map uri="LookupCostComponentCalc"><security https="true" auth="true"/><response name="success" type="view" value="LookupCostComponentCalc"/></request-map> <request-map uri="LookupDataResource"><security auth="true" https="true"/><response name="success" type="view" value="LookupDataResource"/></request-map> <request-map uri="LookupPerson"><security auth="true" https="true"/><response name="success" type="view" value="LookupPerson"/></request-map> <request-map uri="LookupPreferredContactMech"><security https="true" auth="true"/><response name="success" type="view" value="LookupPreferredContactMech"/></request-map> @@ -3254,6 +3255,7 @@ under the License. <view-map name="LookupProductStore" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProductStore"/> <view-map name="LookupFacilityLocation" page="component://product/widget/facility/LookupScreens.xml#LookupFacilityLocation" type="screen"/> <view-map name="LookupWorkEffort" type="screen" page="component://workeffort/widget/LookupScreens.xml#LookupWorkEffort"/> + <view-map name="LookupCostComponentCalc" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupCostComponentCalc"/> <view-map name="LookupDataResource" page="component://content/widget/content/DataResourceScreens.xml#LookupDataResource" type="screen"/> <view-map name="LookupPerson" page="component://party/widget/partymgr/LookupScreens.xml#LookupPerson" type="screen"/> <view-map name="LookupPreferredContactMech" type="screen" page="component://marketing/widget/ContactListScreens.xml#LookupPreferredContactMech"/> @@ -3286,4 +3288,4 @@ under the License. <view-map name="LookupImageFrame" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#LookupImageFrame"/> <view-map name="ImageResize" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#ImageResize"/> <!-- end of view mappings --> -</site-conf> +</site-conf> \ No newline at end of file Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/category/CategoryTree.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/category/CategoryTree.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/category/CategoryTree.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/category/CategoryTree.ftl Mon Aug 18 07:42:27 2014 @@ -35,9 +35,9 @@ var rawdata = [ <#if (rootCat?has_content)> <#list rootCat as root> { - "data": {"title" : unescapeHtmlText("<#if root.categoryName?exists>${root.categoryName?js_string} [${root.productCategoryId}]<#else>${root.productCategoryId?js_string}</#if>"), "attr": {"href" : "<@ofbizUrl>/EditProdCatalog?prodCatalogId=${root.productCategoryId}</@ofbizUrl>","onClick" : "callDocument('${root.productCategoryId}', 'catalog');"}}, + "data": {"title" : unescapeHtmlText("<#if root.categoryName??>${root.categoryName?js_string} [${root.productCategoryId}]<#else>${root.productCategoryId?js_string}</#if>"), "attr": {"href" : "<@ofbizUrl>/EditProdCatalog?prodCatalogId=${root.productCategoryId}</@ofbizUrl>","onClick" : "callDocument('${root.productCategoryId}', 'catalog');"}}, "attr": {"id" : "${root.productCategoryId}", "rel" : "root", "isCatalog" : "${root.isCatalog?string}" ,"isCategoryType" : "${root.isCategoryType?string}"} - <#if root.child?exists> + <#if root.child??> ,"state" : "closed" </#if> <#if root_has_next> @@ -59,7 +59,7 @@ var rawdata = [ $.cookie('jstree_open', null); <#else> <#-- Coloring the category when type the product categoryId manualy at the url bar --> - $.cookie('jstree_select', "<#if productCategoryId?exists>${productCategoryId}<#elseif prodCatalogId?exists>${prodCatalogId}<#elseif showProductCategoryId?exists>${showProductCategoryId}</#if>"); + $.cookie('jstree_select', "<#if productCategoryId??>${productCategoryId}<#elseif prodCatalogId??>${prodCatalogId}<#elseif showProductCategoryId??>${showProductCategoryId}</#if>"); </#if> jQuery("#tree").jstree({ "plugins" : [ "themes", "json_data","ui" ,"cookies", "types"], Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/category/EditCategory.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/category/EditCategory.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/category/EditCategory.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/category/EditCategory.ftl Mon Aug 18 07:42:27 2014 @@ -30,10 +30,10 @@ function insertImageName(type,nameValue) <#if !(clientFileName?has_content)> <div>${uiLabelMap.ProductNoFileSpecifiedForUpload}.</div> <#else> - <div>${uiLabelMap.ProductTheFileOnYourComputer}: <b>${clientFileName?if_exists}</b></div> - <div>${uiLabelMap.ProductServerFileName}: <b>${fileNameToUse?if_exists}</b></div> - <div>${uiLabelMap.ProductServerDirectory}: <b>${imageServerPath?if_exists}</b></div> - <div>${uiLabelMap.ProductTheUrlOfYourUploadedFile}: <b><a href="<@ofbizContentUrl>${imageUrl?if_exists}</@ofbizContentUrl>">${imageUrl?if_exists}</a></b></div> + <div>${uiLabelMap.ProductTheFileOnYourComputer}: <b>${clientFileName!}</b></div> + <div>${uiLabelMap.ProductServerFileName}: <b>${fileNameToUse!}</b></div> + <div>${uiLabelMap.ProductServerDirectory}: <b>${imageServerPath!}</b></div> + <div>${uiLabelMap.ProductTheUrlOfYourUploadedFile}: <b><a href="<@ofbizContentUrl>${imageUrl!}</@ofbizContentUrl>">${imageUrl!}</a></b></div> </#if> </div> </div> @@ -100,10 +100,10 @@ function insertImageName(type,nameValue) <#list productCategoryTypes as productCategoryTypeData> <#if requestParameters.productCategoryTypeId?has_content> <#assign selectedKey = requestParameters.productCategoryTypeId> - <#elseif (productCategory?has_content && productCategory.productCategoryTypeId?if_exists == productCategoryTypeData.productCategoryTypeId)> + <#elseif (productCategory?has_content && productCategory.productCategoryTypeId! == productCategoryTypeData.productCategoryTypeId)> <#assign selectedKey = productCategory.productCategoryTypeId> </#if> - <option <#if selectedKey == productCategoryTypeData.productCategoryTypeId?if_exists>selected="selected"</#if> value="${productCategoryTypeData.productCategoryTypeId}">${productCategoryTypeData.get("description",locale)}</option> + <option <#if selectedKey == productCategoryTypeData.productCategoryTypeId!>selected="selected"</#if> value="${productCategoryTypeData.productCategoryTypeId}">${productCategoryTypeData.get("description",locale)}</option> </#list> </select> </td> @@ -111,18 +111,18 @@ function insertImageName(type,nameValue) <tr> <td width="26%" align="right" class="label">${uiLabelMap.ProductProductCategoryName}</td> <td> </td> - <td width="74%"><input type="text" value="${(productCategory.categoryName)?if_exists}" name="categoryName" size="60" maxlength="60"/></td> + <td width="74%"><input type="text" value="${(productCategory.categoryName)!}" name="categoryName" size="60" maxlength="60"/></td> </tr> <tr> <td width="26%" align="right" class="label">${uiLabelMap.ProductProductCategoryDescription}</td> <td> </td> - <td width="74%"><textarea name="description" cols="60" rows="2"><#if productCategory?has_content>${(productCategory.description)?if_exists}</#if></textarea></td> + <td width="74%"><textarea name="description" cols="60" rows="2"><#if productCategory?has_content>${(productCategory.description)!}</#if></textarea></td> </tr> <tr> <td width="20%" align="right" valign="top" class="label"> ${uiLabelMap.ProductCategoryImageUrl} - <#if (productCategory.categoryImageUrl)?exists> - <a href="<@ofbizContentUrl>${(productCategory.categoryImageUrl)?if_exists}</@ofbizContentUrl>" target="_blank"><img alt="Category Image" src="<@ofbizContentUrl>${(productCategory.categoryImageUrl)?if_exists}</@ofbizContentUrl>" class="cssImgSmall" /></a> + <#if (productCategory.categoryImageUrl)??> + <a href="<@ofbizContentUrl>${(productCategory.categoryImageUrl)!}</@ofbizContentUrl>" target="_blank"><img alt="Category Image" src="<@ofbizContentUrl>${(productCategory.categoryImageUrl)!}</@ofbizContentUrl>" class="cssImgSmall" /></a> </#if> </td> <td> </td> @@ -141,8 +141,8 @@ function insertImageName(type,nameValue) <tr> <td width="20%" align="right" valign="top" class="label"> ${uiLabelMap.ProductLinkOneImageUrl} - <#if (productCategory.linkOneImageUrl)?exists> - <a href="<@ofbizContentUrl>${(productCategory.linkOneImageUrl)?if_exists}</@ofbizContentUrl>" target="_blank"><img alt="Link One Image" src="<@ofbizContentUrl>${(productCategory.linkOneImageUrl)?if_exists}</@ofbizContentUrl>" class="cssImgSmall" /></a> + <#if (productCategory.linkOneImageUrl)??> + <a href="<@ofbizContentUrl>${(productCategory.linkOneImageUrl)!}</@ofbizContentUrl>" target="_blank"><img alt="Link One Image" src="<@ofbizContentUrl>${(productCategory.linkOneImageUrl)!}</@ofbizContentUrl>" class="cssImgSmall" /></a> </#if> </td> <td> </td> @@ -161,8 +161,8 @@ function insertImageName(type,nameValue) <tr> <td width="20%" align="right" valign="top" class="label"> ${uiLabelMap.ProductLinkTwoImageUrl} - <#if (productCategory.linkTwoImageUrl)?exists> - <a href="<@ofbizContentUrl>${(productCategory.linkTwoImageUrl)?if_exists}</@ofbizContentUrl>" target="_blank"><img alt="Link One Image" src="<@ofbizContentUrl>${(productCategory.linkTwoImageUrl)?if_exists}</@ofbizContentUrl>" class="cssImgSmall" /></a> + <#if (productCategory.linkTwoImageUrl)??> + <a href="<@ofbizContentUrl>${(productCategory.linkTwoImageUrl)!}</@ofbizContentUrl>" target="_blank"><img alt="Link One Image" src="<@ofbizContentUrl>${(productCategory.linkTwoImageUrl)!}</@ofbizContentUrl>" class="cssImgSmall" /></a> </#if> </td> <td> </td> @@ -182,7 +182,7 @@ function insertImageName(type,nameValue) <td width="26%" align="right" class="label">${uiLabelMap.ProductDetailScreen}</td> <td> </td> <td width="74%"> - <input type="text" <#if productCategory?has_content>value="${productCategory.detailScreen?if_exists}"</#if> name="detailScreen" size="60" maxlength="250"/> + <input type="text" <#if productCategory?has_content>value="${productCategory.detailScreen!}"</#if> name="detailScreen" size="60" maxlength="250"/> <br /><span class="tooltip">${uiLabelMap.ProductDefaultsTo} "categorydetail", ${uiLabelMap.ProductDetailScreenMessage}: "component://ecommerce/widget/CatalogScreens.xml#categorydetail"</span> </td> </tr> @@ -213,7 +213,7 @@ function insertImageName(type,nameValue) <h3>${uiLabelMap.ProductCategoryUploadImage}</h3> </div> <div class="screenlet-body"> - <form method="post" enctype="multipart/form-data" action="<@ofbizUrl>UploadCategoryImage?productCategoryId=${productCategoryId?if_exists}&upload_file_type=category</@ofbizUrl>" name="imageUploadForm"> + <form method="post" enctype="multipart/form-data" action="<@ofbizUrl>UploadCategoryImage?productCategoryId=${productCategoryId!}&upload_file_type=category</@ofbizUrl>" name="imageUploadForm"> <table cellspacing="0" class="basic-table"> <tr><td> <input type="file" size="50" name="fname"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/category/EditCategoryContent.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/category/EditCategoryContent.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/category/EditCategoryContent.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/category/EditCategoryContent.ftl Mon Aug 18 07:42:27 2014 @@ -24,7 +24,7 @@ under the License. <form action="<@ofbizUrl>updateCategoryContent</@ofbizUrl>" method="post" style="margin: 0;" name="categoryForm"> <table cellspacing="0" class="basic-table"> <tr> - <td width="26%" align="right" class="label"><input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}" />${uiLabelMap.ProductProductCategoryType}</td> + <td width="26%" align="right" class="label"><input type="hidden" name="productCategoryId" value="${productCategoryId!}" />${uiLabelMap.ProductProductCategoryType}</td> <td> </td> <td width="74%"> <select name="productCategoryTypeId" size="1"> @@ -38,27 +38,27 @@ under the License. <tr> <td width="26%" align="right" class="label">${uiLabelMap.ProductName}</td> <td> </td> - <td width="74%"><input type="text" value="${(productCategory.categoryName)?if_exists}" name="categoryName" size="60" maxlength="60"/></td> + <td width="74%"><input type="text" value="${(productCategory.categoryName)!}" name="categoryName" size="60" maxlength="60"/></td> </tr> <tr> <td width="26%" align="right" class="label">${uiLabelMap.ProductCategoryDescription}</td> <td> </td> <td width="74%" colspan="4" valign="top"> - <textarea name="description" cols="60" rows="2">${(productCategory.description)?if_exists}</textarea> + <textarea name="description" cols="60" rows="2">${(productCategory.description)!}</textarea> </td> </tr> <tr> <td width="26%" align="right" valign="top" class="label">${uiLabelMap.ProductLongDescription}</td> <td> </td> <td width="74%" colspan="4" valign="top"> - <textarea name="longDescription" cols="60" rows="7">${(productCategory.longDescription)?if_exists}</textarea> + <textarea name="longDescription" cols="60" rows="7">${(productCategory.longDescription)!}</textarea> </td> </tr> <tr> <td width="26%" align="right" class="label">${uiLabelMap.ProductDetailScreen}</td> <td> </td> <td width="74%"> - <input type="text" <#if productCategory?has_content>value="${productCategory.detailScreen?if_exists}"</#if> name="detailScreen" size="60" maxlength="250" /> + <input type="text" <#if productCategory?has_content>value="${productCategory.detailScreen!}"</#if> name="detailScreen" size="60" maxlength="250" /> <br /> <span class="tooltip">${uiLabelMap.ProductDefaultsTo} "categorydetail", ${uiLabelMap.ProductDetailScreenMessage}: "component://ecommerce/widget/CatalogScreens.xml#categorydetail"</span> </td> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl Mon Aug 18 07:42:27 2014 @@ -17,11 +17,11 @@ specific language governing permissions under the License. --> <form method="post" action="<@ofbizUrl>attachProductFeaturesToCategory</@ofbizUrl>" name="attachProductFeaturesToCategory"> - <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}" /> + <input type="hidden" name="productCategoryId" value="${productCategoryId!}" /> </form> <a href="javascript:document.attachProductFeaturesToCategory.submit()" class="buttontext">${uiLabelMap.ProductFeatureCategoryAttach}</a> -<#if productCategoryId?exists && productCategory?exists> +<#if productCategoryId?? && productCategory??> <div class="screenlet"> <div class="screenlet-title-bar"> <h3>${uiLabelMap.PageTitleEditCategoryFeatureCategories}</h3> @@ -41,28 +41,28 @@ under the License. <#assign line = line + 1> <#assign productFeatureGroup = (productFeatureCatGrpAppl.getRelatedOne("ProductFeatureGroup", false))?default(null)> <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> - <td><a href="<@ofbizUrl>EditFeatureGroupAppls?productFeatureGroupId=${(productFeatureCatGrpAppl.productFeatureGroupId)?if_exists}</@ofbizUrl>" class="buttontext"><#if productFeatureGroup?exists>${(productFeatureGroup.description)?if_exists}</#if> [${(productFeatureCatGrpAppl.productFeatureGroupId)?if_exists}]</a></td> + <td><a href="<@ofbizUrl>EditFeatureGroupAppls?productFeatureGroupId=${(productFeatureCatGrpAppl.productFeatureGroupId)!}</@ofbizUrl>" class="buttontext"><#if productFeatureGroup??>${(productFeatureGroup.description)!}</#if> [${(productFeatureCatGrpAppl.productFeatureGroupId)!}]</a></td> <#assign hasntStarted = false> - <#if (productFeatureCatGrpAppl.getTimestamp("fromDate"))?exists && nowTimestamp.before(productFeatureCatGrpAppl.getTimestamp("fromDate"))> <#assign hasntStarted = true></#if> - <td><div<#if hasntStarted> style="color: red;</#if>>${(productFeatureCatGrpAppl.fromDate)?if_exists}</div></td> + <#if (productFeatureCatGrpAppl.getTimestamp("fromDate"))?? && nowTimestamp.before(productFeatureCatGrpAppl.getTimestamp("fromDate"))> <#assign hasntStarted = true></#if> + <td><div<#if hasntStarted> style="color: red;</#if>>${(productFeatureCatGrpAppl.fromDate)!}</div></td> <td align="center"> <form method="post" action="<@ofbizUrl>updateProductFeatureCatGrpAppl</@ofbizUrl>" name="lineFormGrp${line}"> <#assign hasExpired = false> - <#if (productFeatureCatGrpAppl.getTimestamp("thruDate"))?exists && nowTimestamp.after(productFeatureCatGrpAppl.getTimestamp("thruDate"))> <#assign hasExpired = true></#if> - <input type="hidden" name="productCategoryId" value="${(productFeatureCatGrpAppl.productCategoryId)?if_exists}" /> - <input type="hidden" name="productFeatureGroupId" value="${(productFeatureCatGrpAppl.productFeatureGroupId)?if_exists}" /> - <input type="hidden" name="fromDate" value="${(productFeatureCatGrpAppl.fromDate)?if_exists}" /> + <#if (productFeatureCatGrpAppl.getTimestamp("thruDate"))?? && nowTimestamp.after(productFeatureCatGrpAppl.getTimestamp("thruDate"))> <#assign hasExpired = true></#if> + <input type="hidden" name="productCategoryId" value="${(productFeatureCatGrpAppl.productCategoryId)!}" /> + <input type="hidden" name="productFeatureGroupId" value="${(productFeatureCatGrpAppl.productFeatureGroupId)!}" /> + <input type="hidden" name="fromDate" value="${(productFeatureCatGrpAppl.fromDate)!}" /> <#if hasExpired><#assign class="alert"></#if> - <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" value="${(productFeatureCatGrpAppl.thruDate)?if_exists}" className="${class!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="22" maxlength="25" id="fromDate1" 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="" value="${(productFeatureCatGrpAppl.thruDate)!}" className="${class!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="22" maxlength="25" id="fromDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;" /> </form> </td> <td align="center"> <a href="javascript:document.removeProductFeatureCatGrpApplForm_${productFeatureCatGrpAppl_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> <form method="post" action="<@ofbizUrl>removeProductFeatureCatGrpAppl</@ofbizUrl>" name="removeProductFeatureCatGrpApplForm_${productFeatureCatGrpAppl_index}"> - <input type="hidden" name="productFeatureGroupId" value="${(productFeatureCatGrpAppl.productFeatureGroupId)?if_exists}" /> - <input type="hidden" name="productCategoryId" value="${(productFeatureCatGrpAppl.productCategoryId)?if_exists}" /> - <input type="hidden" name="fromDate" value="${(productFeatureCatGrpAppl.fromDate)?if_exists}" /> + <input type="hidden" name="productFeatureGroupId" value="${(productFeatureCatGrpAppl.productFeatureGroupId)!}" /> + <input type="hidden" name="productCategoryId" value="${(productFeatureCatGrpAppl.productCategoryId)!}" /> + <input type="hidden" name="fromDate" value="${(productFeatureCatGrpAppl.fromDate)!}" /> </form> </td> </tr> @@ -85,10 +85,10 @@ under the License. <table cellspacing="0" class="basic-table"> <tr><td> <form method="post" action="<@ofbizUrl>createProductFeatureCatGrpAppl</@ofbizUrl>" style="margin: 0;" name="addNewGroupForm"> - <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}" /> + <input type="hidden" name="productCategoryId" value="${productCategoryId!}" /> <select name="productFeatureGroupId"> <#list productFeatureGroups as productFeatureGroup> - <option value="${(productFeatureGroup.productFeatureGroupId)?if_exists}">${(productFeatureGroup.description)?if_exists} [${(productFeatureGroup.productFeatureGroupId)?if_exists}]</option> + <option value="${(productFeatureGroup.productFeatureGroupId)!}">${(productFeatureGroup.description)!} [${(productFeatureGroup.productFeatureGroupId)!}]</option> </#list> </select> <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="fromDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> @@ -120,28 +120,28 @@ under the License. <#assign line = line + 1> <#assign productFeatureCategory = (productFeatureCategoryAppl.getRelatedOne("ProductFeatureCategory", false))?default(null)> <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>> - <td><a href="<@ofbizUrl>EditFeatureCategoryFeatures?productFeatureCategoryId=${(productFeatureCategoryAppl.productFeatureCategoryId)?if_exists}</@ofbizUrl>" class="buttontext"><#if productFeatureCategory?exists>${(productFeatureCategory.description)?if_exists}</#if> [${(productFeatureCategoryAppl.productFeatureCategoryId)?if_exists}]</a></td> + <td><a href="<@ofbizUrl>EditFeatureCategoryFeatures?productFeatureCategoryId=${(productFeatureCategoryAppl.productFeatureCategoryId)!}</@ofbizUrl>" class="buttontext"><#if productFeatureCategory??>${(productFeatureCategory.description)!}</#if> [${(productFeatureCategoryAppl.productFeatureCategoryId)!}]</a></td> <#assign hasntStarted = false> - <#if (productFeatureCategoryAppl.getTimestamp("fromDate"))?exists && nowTimestamp.before(productFeatureCategoryAppl.getTimestamp("fromDate"))> <#assign hasntStarted = true></#if> - <td <#if hasntStarted> style="color: red;"</#if>>${(productFeatureCategoryAppl.fromDate)?if_exists}</td> + <#if (productFeatureCategoryAppl.getTimestamp("fromDate"))?? && nowTimestamp.before(productFeatureCategoryAppl.getTimestamp("fromDate"))> <#assign hasntStarted = true></#if> + <td <#if hasntStarted> style="color: red;"</#if>>${(productFeatureCategoryAppl.fromDate)!}</td> <td align="center"> <form method="post" action="<@ofbizUrl>updateProductFeatureCategoryAppl</@ofbizUrl>" name="lineForm${line}"> <#assign hasExpired = false> - <#if (productFeatureCategoryAppl.getTimestamp("thruDate"))?exists && nowTimestamp.after(productFeatureCategoryAppl.getTimestamp("thruDate"))> <#assign hasExpired = true></#if> - <input type="hidden" name="productCategoryId" value="${(productFeatureCategoryAppl.productCategoryId)?if_exists}" /> - <input type="hidden" name="productFeatureCategoryId" value="${(productFeatureCategoryAppl.productFeatureCategoryId)?if_exists}" /> - <input type="hidden" name="fromDate" value="${(productFeatureCategoryAppl.fromDate)?if_exists}" /> + <#if (productFeatureCategoryAppl.getTimestamp("thruDate"))?? && nowTimestamp.after(productFeatureCategoryAppl.getTimestamp("thruDate"))> <#assign hasExpired = true></#if> + <input type="hidden" name="productCategoryId" value="${(productFeatureCategoryAppl.productCategoryId)!}" /> + <input type="hidden" name="productFeatureCategoryId" value="${(productFeatureCategoryAppl.productFeatureCategoryId)!}" /> + <input type="hidden" name="fromDate" value="${(productFeatureCategoryAppl.fromDate)!}" /> <#if hasExpired><#assign class="alert"></#if> - <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" value="${(productFeatureCategoryAppl.thruDate)?if_exists}" className="${class!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="thruDate2" 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="" value="${(productFeatureCategoryAppl.thruDate)!}" className="${class!''}" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="thruDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <input type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;" /> </form> </td> <td align="center"> <a href="javascript:document.removeProductFeatureCategoryApplForm_${productFeatureCategoryAppl_index}.submit()" class="buttontext">${uiLabelMap.CommonDelete}</a> <form method="post" action="<@ofbizUrl>removeProductFeatureCategoryAppl</@ofbizUrl>" name="removeProductFeatureCategoryApplForm_${productFeatureCategoryAppl_index}"> - <input type="hidden" name="productFeatureCategoryId" value="${(productFeatureCategoryAppl.productFeatureCategoryId)?if_exists}" /> - <input type="hidden" name="productCategoryId" value="${(productFeatureCategoryAppl.productCategoryId)?if_exists}" /> - <input type="hidden" name="fromDate" value="${(productFeatureCategoryAppl.fromDate)?if_exists}" /> + <input type="hidden" name="productFeatureCategoryId" value="${(productFeatureCategoryAppl.productFeatureCategoryId)!}" /> + <input type="hidden" name="productCategoryId" value="${(productFeatureCategoryAppl.productCategoryId)!}" /> + <input type="hidden" name="fromDate" value="${(productFeatureCategoryAppl.fromDate)!}" /> </form> </td> </tr> @@ -163,10 +163,10 @@ under the License. <table cellspacing="0" class="basic-table"> <tr><td> <form method="post" action="<@ofbizUrl>createProductFeatureCategoryAppl</@ofbizUrl>" style="margin: 0;" name="addNewCategoryForm"> - <input type="hidden" name="productCategoryId" value="${productCategoryId?if_exists}" /> + <input type="hidden" name="productCategoryId" value="${productCategoryId!}" /> <select name="productFeatureCategoryId"> <#list productFeatureCategories as productFeatureCategory> - <option value="${(productFeatureCategory.productFeatureCategoryId)?if_exists}">${(productFeatureCategory.description)?if_exists} [${(productFeatureCategory.productFeatureCategoryId)?if_exists}]</option> + <option value="${(productFeatureCategory.productFeatureCategoryId)!}">${(productFeatureCategory.description)!} [${(productFeatureCategory.productFeatureCategoryId)!}]</option> </#list> </select> <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" value="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="fromDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |