OFBiz › OFBiz - Commits

svn commit: r1553086 [10/10] - in /ofbiz/branches/jackrabbit20120501: ./ applications/accounting/config/ applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ applications/commonext/config/ applications/content/config/ applications/con...

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
jleroux@apache.org
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r1553086 [10/10] - in /ofbiz/branches/jackrabbit20120501: ./ applications/accounting/config/ applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ applications/commonext/config/ applications/content/config/ applications/con...

jleroux@apache.org
Modified: ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/screen/ScreenFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/screen/ScreenFactory.java?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/screen/ScreenFactory.java (original)
+++ ofbiz/branches/jackrabbit20120501/framework/widget/src/org/ofbiz/widget/screen/ScreenFactory.java Mon Dec 23 09:26:58 2013
@@ -132,7 +132,7 @@ public class ScreenFactory {
             }
         }
 
-        if (modelScreenMap == null) {
+        if (modelScreenMap.isEmpty()) {
             throw new IllegalArgumentException("Could not find screen file with name [" + resourceName + "]");
         }
         return modelScreenMap;

Modified: ofbiz/branches/jackrabbit20120501/framework/widget/templates/htmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/branches/jackrabbit20120501/framework/widget/templates/htmlFormMacroLibrary.ftl Mon Dec 23 09:26:58 2013
@@ -743,8 +743,7 @@ Parameter: lastViewName, String, optiona
         <li class="${paginateFirstStyle}<#if viewIndex gt 0>"><a href="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxFirstUrl}')<#else>${firstUrl}</#if>">${paginateFirstLabel}</a><#else>-disabled"><span>${paginateFirstLabel}</span></#if></li>
         <li class="${paginatePreviousStyle}<#if viewIndex gt 0>"><a href="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxPreviousUrl}')<#else>${previousUrl}</#if>">${paginatePreviousLabel}</a><#else>-disabled"><span>${paginatePreviousLabel}</span></#if></li>
         <#if listSize gt 0 && javaScriptEnabled><li class="nav-page-select">${pageLabel} <select name="page" size="1" onchange="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxSelectUrl}')<#else>location.href='${selectUrl}'+this.value;</#if>"><#rt/>
-          <#assign x=listSize/viewSize?floor>
-          <#if listSize gt (viewIndex*viewSize)><#assign x=x+1></#if>
+          <#assign x=(listSize/viewSize)?ceiling>
             <#list 1..x as i>
               <#if i == (viewIndex+1)><option selected="selected" value="<#else><option value="</#if>${i-1}">${i}</option>
             </#list>

Modified: ofbiz/branches/jackrabbit20120501/specialpurpose/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/LICENSE?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/specialpurpose/LICENSE (original)
+++ ofbiz/branches/jackrabbit20120501/specialpurpose/LICENSE Mon Dec 23 09:26:58 2013
@@ -592,7 +592,7 @@ specialpurpose/pos/lib/XuiOptional-v3.2r
      "MPL", "NPL" or any confusingly similar phrase do not appear in your
      license (except to note that your license differs from this License)
      and (b) otherwise make it clear that Your version of the license
-     contains terms which differ from thella Public License and
+     contains terms which differ from the Mozilla Public License and
      Netscape Public License. (Filling in the name of the Initial
      Developer, Original Code or Contributor in the notice described in
      Exhibit A shall not of themselves be deemed to be modifications of

Modified: ofbiz/branches/jackrabbit20120501/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20120501/specialpurpose/ebaystore/config/EbayStoreUiLabels.xml Mon Dec 23 09:26:58 2013
@@ -284,22 +284,18 @@
     </property>
     <property key="EbayStoreStoreItemListDesplay">
         <value xml:lang="en">Store Item List Display</value>
-        <value xml:lang="th"></value>
         <value xml:lang="zh">显示店铺商品列表</value>
     </property>
     <property key="EbayStoreStoreItemSortOrder">
         <value xml:lang="en">Store Item Sort Order</value>
-        <value xml:lang="th"></value>
         <value xml:lang="zh">店铺商品排序</value>
     </property>
     <property key="EbayStoreStoreMerchDisplay">
         <value xml:lang="en">Store Merch Display</value>
-        <value xml:lang="th"></value>
         <value xml:lang="zh">显示店铺商品</value>
     </property>
     <property key="EbayStoreStoreSubscriptionLevel">
         <value xml:lang="en">Store Subscription Level</value>
-        <value xml:lang="th"></value>
         <value xml:lang="zh">店铺订阅等级</value>
     </property>
     <property key="EbayStoreUpdateItemSuccessfully">

Modified: ofbiz/branches/jackrabbit20120501/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java (original)
+++ ofbiz/branches/jackrabbit20120501/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java Mon Dec 23 09:26:58 2013
@@ -1311,9 +1311,6 @@ public class EbayStore {
                 storeType.setCustomHeader((String)context.get("storeCustomHeader"));
                 storeType.setCustomHeaderLayout(StoreCustomHeaderLayoutCodeType.valueOf((String)context.get("storeCustomHeaderLayout")));
 
-                if ( storeType == null )
-                      throw new SdkException("StoreType property is not set.");
-
                 req.setStore(storeType);
                 resp = (SetStoreResponseType) call.execute(req);
 
@@ -1885,8 +1882,11 @@ public class EbayStore {
             final ItemType[] activeItems = tempActiveItems;
             // Display active items in table.
             AbstractTableModel dataModel = new AbstractTableModel() {
+                @Override
                 public int getColumnCount() { return 0; }
+                @Override
                 public int getRowCount() { return activeItems == null ? 0 : activeItems.length;}
+                @Override
                 public Map<String, Object> getValueAt(int row, int col) {
                     ItemType item = activeItems[row];
                     return itemToColumns(item);
@@ -1900,8 +1900,11 @@ public class EbayStore {
             final ItemType[] scheItems = tempItems;
             // Display Scheduled items in table.
             dataModel = new AbstractTableModel() {
+                @Override
                 public int getColumnCount() { return 0; }
+                @Override
                 public int getRowCount() { return scheItems == null ? 0 : scheItems.length;}
+                @Override
                 public Map<String, Object> getValueAt(int row, int col) {
                     ItemType item = scheItems[row];
                     return schItemToColumns(item);
@@ -1923,8 +1926,11 @@ public class EbayStore {
             final ItemType[] unSoldItems = tempUnSoldItems;
             // Display unsold items in table.
             dataModel = new AbstractTableModel() {
+                @Override
                 public int getColumnCount() { return 0; }
+                @Override
                 public int getRowCount() { return unSoldItems == null ? 0 : unSoldItems.length;}
+                @Override
                 public Map<String, Object> getValueAt(int row, int col) {
                     ItemType item = unSoldItems[row];
                     return unsoldItemToColumns(item);

Modified: ofbiz/branches/jackrabbit20120501/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl (original)
+++ ofbiz/branches/jackrabbit20120501/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl Mon Dec 23 09:26:58 2013
@@ -745,9 +745,9 @@ $(function(){
                     <#if !imageUrl?string?has_content>
                       <#assign imageUrl = "/images/defaultImage.jpg" />
                     </#if>
+                      <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);" class="linktext">${key}</a>
                       <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);"><img src="<@ofbizContentUrl>${contentPathPrefix?if_exists}${imageUrl}</@ofbizContentUrl>" class="cssImgSmall" alt="" /></a>
                       <br />
-                      <a href="javascript:getList('FT${featureOrderFirst}','${indexer}',1);" class="linktext">${key}</a>
                   </#if>
                   <#assign indexer = indexer + 1 />
                 </#list>

Modified: ofbiz/branches/jackrabbit20120501/specialpurpose/googlebase/config/GoogleBaseUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/googlebase/config/GoogleBaseUiLabels.xml?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/specialpurpose/googlebase/config/GoogleBaseUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20120501/specialpurpose/googlebase/config/GoogleBaseUiLabels.xml Mon Dec 23 09:26:58 2013
@@ -88,12 +88,7 @@
         <value xml:lang="zh">自动更新选项</value>
     </property>
     <property key="GoogleBaseCompanyName">
-        <value xml:lang="en">Ofbiz</value>
-        <value xml:lang="fr">Ofbiz</value>
-        <value xml:lang="it">Ofbiz</value>
-        <value xml:lang="ja">Ofbiz</value>
-        <value xml:lang="th">Ofbiz</value>
-        <value xml:lang="zh">OFBiz</value>
+        <value xml:lang="en">OFBiz</value>
     </property>
     <property key="GoogleBaseConfiguration">
         <value xml:lang="en">Google Base Configurations</value>

Modified: ofbiz/branches/jackrabbit20120501/specialpurpose/myportal/config/MyPortalUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/myportal/config/MyPortalUiLabels.xml?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/specialpurpose/myportal/config/MyPortalUiLabels.xml (original)
+++ ofbiz/branches/jackrabbit20120501/specialpurpose/myportal/config/MyPortalUiLabels.xml Mon Dec 23 09:26:58 2013
@@ -59,7 +59,6 @@
         <value xml:lang="it">Nome mancante</value>
         <value xml:lang="ja">姓/firstNameが正しくありません</value>
         <value xml:lang="th">กรุณากรอกชื่อของท่าน</value>
-        <value xml:lang="vi"></value>
         <value xml:lang="zh">缺少你的名</value>
         <value xml:lang="zh_TW">缺少名字(Firstname)</value>
     </property>
@@ -198,7 +197,6 @@
         <value xml:lang="it">Miei compiti</value>
         <value xml:lang="ja">私のタスク</value>
         <value xml:lang="th">งานของฉัน</value>
-        <value xml:lang="vi"></value>
         <value xml:lang="zh">我的任务</value>
         <value xml:lang="zh_TW">我的任務</value>
     </property>

Modified: ofbiz/branches/jackrabbit20120501/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumServices.java?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumServices.java (original)
+++ ofbiz/branches/jackrabbit20120501/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumServices.java Mon Dec 23 09:26:58 2013
@@ -226,7 +226,7 @@ public class ScrumServices {
 
                             List<GenericValue> workEffortList = delegator.findList("WorkEffort", EntityCondition.makeCondition(exprsAnd, EntityOperator.AND), null, null, null, false);
                             if (UtilValidate.isEmpty(workeffContentList) && UtilValidate.isNotEmpty(workEffortList)) {
-                                Map inputMap = FastMap.newInstance();
+                                Map<String, Object> inputMap = FastMap.newInstance();
                                 inputMap.put("taskId", taskId);
                                 inputMap.put("user", user);
                                 inputMap.put("revisionNumber", Integer.toString(i));

Modified: ofbiz/branches/jackrabbit20120501/themes/bizznesstime/includes/secondary-appbar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/themes/bizznesstime/includes/secondary-appbar.ftl?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/themes/bizznesstime/includes/secondary-appbar.ftl (original)
+++ ofbiz/branches/jackrabbit20120501/themes/bizznesstime/includes/secondary-appbar.ftl Mon Dec 23 09:26:58 2013
@@ -38,7 +38,7 @@ under the License.
       <#if thisApp != "/">
         <#assign thisURL = thisURL + "/control/main">
       </#if>
-      <li><a<#if selected> class="current-section"</#if> href="${thisURL}${externalKeyParam}" <#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}"> ${display.title}</#if></a></li>
+      <li><a<#if selected> class="current-section"</#if> href="${thisURL}${StringUtil.wrapString(externalKeyParam)}" <#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}"> ${display.title}</#if></a></li>
     </#list>
   </ul>
 </#if>
\ No newline at end of file

Modified: ofbiz/branches/jackrabbit20120501/themes/flatgrey/includes/appbar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/themes/flatgrey/includes/appbar.ftl?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/themes/flatgrey/includes/appbar.ftl (original)
+++ ofbiz/branches/jackrabbit20120501/themes/flatgrey/includes/appbar.ftl Mon Dec 23 09:26:58 2013
@@ -52,7 +52,7 @@ under the License.
               <li>
             </#if>
           </#if>
-          <a href="${thisURL}${externalKeyParam}"<#if selected> class="selected"</#if><#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a>
+          <a href="${thisURL}${StringUtil.wrapString(externalKeyParam)}"<#if selected> class="selected"</#if><#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a>
           <#assign appCount = appCount + 1>
         </#if>
       </#list>
@@ -76,7 +76,7 @@ under the License.
             <li>
           </#if>
         </#if>
-        <a href="${thisURL}${externalKeyParam}"<#if selected> class="selected"</#if><#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a>
+        <a href="${thisURL}${StringUtil.wrapString(externalKeyParam)}"<#if selected> class="selected"</#if><#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a>
         <#assign appCount = appCount + 1>
       </#list>
       <#if appCount != 0>

Modified: ofbiz/branches/jackrabbit20120501/themes/flatgrey/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20120501/themes/flatgrey/includes/header.ftl?rev=1553086&r1=1553085&r2=1553086&view=diff
==============================================================================
--- ofbiz/branches/jackrabbit20120501/themes/flatgrey/includes/header.ftl (original)
+++ ofbiz/branches/jackrabbit20120501/themes/flatgrey/includes/header.ftl Mon Dec 23 09:26:58 2013
@@ -133,7 +133,7 @@ under the License.
             <#if layoutSettings.topLines?has_content>
               <#list layoutSettings.topLines as topLine>
                 <#if topLine.text?exists>
-                  <li>${topLine.text}<a href="${StringUtil.wrapString(topLine.url?if_exists)}${externalKeyParam}">${topLine.urlText?if_exists}</a></li>
+                  <li>${topLine.text}<a href="${StringUtil.wrapString(topLine.url?if_exists)}${StringUtil.wrapString(externalKeyParam)}">${topLine.urlText?if_exists}</a></li>
                 <#elseif topLine.dropDownList?exists>
                   <li><#include "component://common/webcommon/includes/insertDropDown.ftl"/></li>
                 <#else>


Free forum by Nabble Edit this page