svn commit: r1728961 - in /ofbiz/trunk: applications/party/webapp/partymgr/party/ applications/product/webapp/facility/facility/ framework/common/webcommon/includes/ framework/widget/templates/ specialpurpose/ecommerce/webapp/ecommerce/ specialpurpose/...

jleroux Sun, 07 Feb 2016 06:00:08 -0800

Author: jleroux
Date: Sun Feb  7 13:59:41 2016
New Revision: 1728961

URL: http://svn.apache.org/viewvc?rev=1728961&view=rev
Log:
Reverts r1728959 because of misc. issues with the patch, see my comment at 
https://issues.apache.org/jira/browse/OFBIZ-6884


Modified:
    ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl
    
ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl
    ofbiz/trunk/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl
    ofbiz/trunk/framework/common/webcommon/includes/messages.ftl
    ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
    
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl
    
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl
    
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/login.ftl

Modified: 
ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl?rev=1728961&r1=1728960&r2=1728961&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl 
(original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl 
Sun Feb  7 13:59:41 2016
@@ -165,11 +165,11 @@ under the License.
       
       <td>     
         <select name="countryGeoId" id="editcontactmechform_countryGeoId">
-          
${screens.render("component://common/widget/CommonScreens.xml#countries")}
+          
${screens.render("component://common/widget/CommonScreens.xml#countries")}      
  
           <#if (mechMap.postalAddress??) && 
(mechMap.postalAddress.countryGeoId??)>
             <#assign defaultCountryGeoId = mechMap.postalAddress.countryGeoId>
           <#else>
-           <#assign defaultCountryGeoId = 
Static["org.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("general.properties",
 "country.geo.id.default")>
+           <#assign defaultCountryGeoId = 
Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("general.properties",
 "country.geo.id.default")>
           </#if>
           <option selected="selected" value="${defaultCountryGeoId}">
             <#assign countryGeo = 
delegator.findOne("Geo",Static["org.ofbiz.base.util.UtilMisc"].toMap("geoId",defaultCountryGeoId),
 false)>

Modified: 
ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl?rev=1728961&r1=1728960&r2=1728961&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl 
(original)
+++ 
ofbiz/trunk/applications/product/webapp/facility/facility/EditContactMech.ftl 
Sun Feb  7 13:59:41 2016
@@ -194,7 +194,7 @@ under the License.
           <#if (mechMap.postalAddress??) && 
(mechMap.postalAddress.countryGeoId??)>
             <#assign defaultCountryGeoId = mechMap.postalAddress.countryGeoId>
           <#else>
-           <#assign defaultCountryGeoId = 
Static["org.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("general.properties",
 "country.geo.id.default")>
+           <#assign defaultCountryGeoId = 
Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("general.properties",
 "country.geo.id.default")>
           </#if>
           <option selected="selected" value="${defaultCountryGeoId}">
             <#assign countryGeo = 
delegator.findOne("Geo",Static["org.ofbiz.base.util.UtilMisc"].toMap("geoId",defaultCountryGeoId),
 false)>

Modified: 
ofbiz/trunk/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl?rev=1728961&r1=1728960&r2=1728961&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl 
(original)
+++ ofbiz/trunk/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl 
Sun Feb  7 13:59:41 2016
@@ -36,7 +36,7 @@ under the License.
 var autocomp = [
     <#if autocompleteOptions?has_content>
         <#if !displayReturnField??>
-            <#assign displayReturnField = 
Static["org.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("widget.properties",
 "widget.autocompleter.displayReturnField")>
+            <#assign displayReturnField = 
Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("widget.properties",
 "widget.autocompleter.displayReturnField")>
         </#if>
         <#list autocompleteOptions as autocompleteOption>
             {

Modified: ofbiz/trunk/framework/common/webcommon/includes/messages.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/messages.ftl?rev=1728961&r1=1728960&r2=1728961&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/messages.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/messages.ftl Sun Feb  7 
13:59:41 2016
@@ -49,10 +49,10 @@ under the License.
       </#if>
     </div>
   </#if>
-  <#assign jGrowlPosition = 
Static["org.ofbiz.entity.util.EntityUtilProperties"].getPropertyValuee("widget.properties",
 "widget.jgrowl.position")>
-  <#assign jGrowlWidth = 
Static["org.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("widget.properties",
 "widget.jgrowl.width")>
-  <#assign jGrowlHeight = 
Static["org.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("widget.properties",
 "widget.jgrowl.height")>
-  <#assign jGrowlSpeed = 
Static["org.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("widget.properties",
 "widget.jgrowl.speed")>
+  <#assign jGrowlPosition = 
Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("widget.properties",
 "widget.jgrowl.position")>
+  <#assign jGrowlWidth = 
Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("widget.properties",
 "widget.jgrowl.width")>
+  <#assign jGrowlHeight = 
Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("widget.properties",
 "widget.jgrowl.height")>
+  <#assign jGrowlSpeed = 
Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("widget.properties",
 "widget.jgrowl.speed")>
   
   
<script>showjGrowl("${uiLabelMap.CommonShowAll}","${uiLabelMap.CommonCollapse}",
 "${uiLabelMap.CommonHideAllNotifications}", "${jGrowlPosition}", 
"${jGrowlWidth}", "${jGrowlHeight}", "${jGrowlSpeed}");</script>
   <#-- display the event messages -->
@@ -68,10 +68,10 @@ under the License.
         </#list>
       </#if>
     </div>
-    <#assign jGrowlPosition = 
Static["org.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("widget.properties",
 "widget.jgrowl.position")>
-    <#assign jGrowlWidth = 
Static["org.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("widget.properties",
 "widget.jgrowl.width")>
-    <#assign jGrowlHeight = 
Static["org.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("widget.properties",
 "widget.jgrowl.height")>
-    <#assign jGrowlSpeed = 
Static["org.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("widget.properties",
 "widget.jgrowl.speed")>
+    <#assign jGrowlPosition = 
Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("widget.properties",
 "widget.jgrowl.position")>
+    <#assign jGrowlWidth = 
Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("widget.properties",
 "widget.jgrowl.width")>
+    <#assign jGrowlHeight = 
Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("widget.properties",
 "widget.jgrowl.height")>
+    <#assign jGrowlSpeed = 
Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("widget.properties",
 "widget.jgrowl.speed")>
     
<script>showjGrowl("${uiLabelMap.CommonShowAll}","${uiLabelMap.CommonCollapse}",
 "${uiLabelMap.CommonHideAllNotifications}", "${jGrowlPosition}", 
"${jGrowlWidth}", "${jGrowlHeight}", "${jGrowlSpeed}");</script>
   </#if>
 </#escape>

Modified: ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=1728961&r1=1728960&r2=1728961&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl Sun Feb  7 
13:59:41 2016
@@ -69,8 +69,8 @@ under the License.
     require
   /><#t/>
   <#if ajaxEnabled?has_content && ajaxEnabled>
-    <#assign defaultMinLength = 
Static["org.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("widget.properties",
 "widget.autocompleter.defaultMinLength")>
-    <#assign defaultDelay = 
Static["org.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("widget.properties",
 "widget.autocompleter.defaultDelay")>
+    <#assign defaultMinLength = 
Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("widget.properties",
 "widget.autocompleter.defaultMinLength")>
+    <#assign defaultDelay = 
Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("widget.properties",
 "widget.autocompleter.defaultDelay")>
     <script language="JavaScript" 
type="text/javascript">ajaxAutoCompleter('${ajaxUrl}', false, 
${defaultMinLength!2}, ${defaultDelay!300});</script><#lt/>
   </#if>
 </#macro>
@@ -640,7 +640,7 @@ Parameter: tabindex, String, optional -
     <#local ajaxUrl = id + "," + ajaxUrl + ",ajaxLookup=Y" />
   </#if>
   <#if (!showDescription?has_content)>
-    <#local showDescriptionProp = 
Static["org.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("widget.properties",
 "widget.lookup.showDescription", "N")>
+    <#local showDescriptionProp = 
Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("widget.properties",
 "widget.lookup.showDescription", "N")>
     <#if "Y" == showDescriptionProp>
       <#local showDescription = "true" />
     <#else>
@@ -648,13 +648,13 @@ Parameter: tabindex, String, optional -
     </#if>
   </#if>
   <#if (!position?has_content)>
-    <#local position = 
Static["org.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("widget.properties",
 "widget.lookup.position", "topleft")>
+    <#local position = 
Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("widget.properties",
 "widget.lookup.position", "topleft")>
   </#if>
   <#if (!width?has_content)>
-    <#local width = 
Static["org.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("widget.properties",
 "widget.lookup.width", "620")>
+    <#local width = 
Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("widget.properties",
 "widget.lookup.width", "620")>
   </#if>
   <#if (!height?has_content)>
-    <#local height = 
Static["org.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("widget.properties",
 "widget.lookup.height", "500")>
+    <#local height = 
Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("widget.properties",
 "widget.lookup.height", "500")>
   </#if>
   <#if ajaxEnabled?has_content && ajaxEnabled>
     <script type="text/javascript">
@@ -691,8 +691,8 @@ Parameter: tabindex, String, optional -
       );"></a><#rt>
     <#else>
       <#if ajaxEnabled?has_content && ajaxEnabled>
-        <#assign defaultMinLength = 
Static["org.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("widget.properties",
 "widget.autocompleter.defaultMinLength")>
-        <#assign defaultDelay = 
Static["org.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("widget.properties",
 "widget.autocompleter.defaultDelay")>
+        <#assign defaultMinLength = 
Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("widget.properties",
 "widget.autocompleter.defaultMinLength")>
+        <#assign defaultDelay = 
Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("widget.properties",
 "widget.autocompleter.defaultDelay")>
         <#local ajaxUrl = ajaxUrl + "&amp;_LAST_VIEW_NAME_=" + lastViewName />
         <#if !ajaxUrl?contains("searchValueFieldName=")>
           <#if descriptionFieldName?has_content && showDescription == "true">

Modified: 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl?rev=1728961&r1=1728960&r2=1728961&view=diff
==============================================================================
--- 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl 
(original)
+++ 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl 
Sun Feb  7 13:59:41 2016
@@ -551,9 +551,9 @@ $(function(){
           <form method="post" action="<@ofbizUrl>additem</@ofbizUrl>" 
name="addform"  style="margin: 0;">
           <fieldset>
             <#assign inStock = true />
-            <#assign commentEnable = 
Static["org.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("order.properties",
 "order.item.comment.enable")>
+            <#assign commentEnable = 
Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("order.properties",
 "order.item.comment.enable")>
             <#if commentEnable.equals("Y")>
-                <#assign orderItemAttr = 
Static["org.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("order.properties",
 "order.item.attr.prefix")>
+                <#assign orderItemAttr = 
Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("order.properties",
 "order.item.attr.prefix")>
                 ${uiLabelMap.CommonComment}&nbsp;<input type="text" 
name="${orderItemAttr}comment"/>
             </#if>
             <#-- Variant Selection -->

Modified: 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl?rev=1728961&r1=1728960&r2=1728961&view=diff
==============================================================================
--- 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl
 (original)
+++ 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl
 Sun Feb  7 13:59:41 2016
@@ -182,7 +182,7 @@ under the License.
           <#if (postalAddress??) && (postalAddress.countryGeoId??)>
             <#assign defaultCountryGeoId = postalAddress.countryGeoId>
           <#else>
-            <#assign defaultCountryGeoId = 
Static["org.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("general.properties",
 "country.geo.id.default")>
+            <#assign defaultCountryGeoId = 
Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("general.properties",
 "country.geo.id.default")>
           </#if>
           <option selected="selected" value="${defaultCountryGeoId}">
           <#assign countryGeo = 
delegator.findOne("Geo",Static["org.ofbiz.base.util.UtilMisc"].toMap("geoId",defaultCountryGeoId),
 false)>

Modified: 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl?rev=1728961&r1=1728960&r2=1728961&view=diff
==============================================================================
--- 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl 
(original)
+++ 
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newcustomer.ftl 
Sun Feb  7 13:59:41 2016
@@ -212,7 +212,7 @@ will generally always be reserved for th
         <@fieldErrors fieldName="CUSTOMER_COUNTRY"/>
         <select name="CUSTOMER_COUNTRY" id="newuserform_countryGeoId">
             
${screens.render("component://common/widget/CommonScreens.xml#countries")}      
  
-            <#assign defaultCountryGeoId = 
Static["org.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("general.properties",
 "country.geo.id.default")>
+            <#assign defaultCountryGeoId = 
Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("general.properties",
 "country.geo.id.default")>
             <option selected="selected" value="${defaultCountryGeoId}">
                 <#assign countryGeo = 
delegator.findOne("Geo",Static["org.ofbiz.base.util.UtilMisc"].toMap("geoId",defaultCountryGeoId),
 false)>
                 ${countryGeo.get("geoName",locale)}

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/login.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/login.ftl?rev=1728961&r1=1728960&r2=1728961&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/login.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/login.ftl Sun Feb  7 
13:59:41 2016
@@ -16,8 +16,8 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-<#assign janrainEnabled = 
Static["org.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("ecommerce.properties",
 "janrain.enabled")>
-<#assign appName = 
Static["org.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("ecommerce.properties",
 "janrain.appName")>
+<#assign janrainEnabled = 
Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("ecommerce.properties",
 "janrain.enabled")>
+<#assign appName = 
Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("ecommerce.properties",
 "janrain.appName")>
 <#if janrainEnabled == "Y">
 <script type="text/javascript">
 (function() {

svn commit: r1728961 - in /ofbiz/trunk: applications/party/webapp/partymgr/party/ applications/product/webapp/facility/facility/ framework/common/webcommon/includes/ framework/widget/templates/ specialpurpose/ecommerce/webapp/ecommerce/ specialpurpose/...

Reply via email to