svn commit: r1040443 - in /ofbiz/branches/jquery: ./ applications/accounting/config/ applications/content/config/ applications/content/template/survey/ applications/order/config/ applications/order/script/org/ofbiz/order/customer/ applications/party/we...

Tue, 30 Nov 2010 01:12:05 -0800 

Author: jleroux
Date: Tue Nov 30 09:10:22 2010
New Revision: 1040443

URL: http://svn.apache.org/viewvc?rev=1040443&view=rev
Log:
Merges the trunk at r1040440

Modified:
    ofbiz/branches/jquery/   (props changed)
    ofbiz/branches/jquery/applications/accounting/config/AccountingUiLabels.xml
    ofbiz/branches/jquery/applications/content/config/ContentUiLabels.xml
    ofbiz/branches/jquery/applications/content/template/survey/genericsurvey.ftl
    ofbiz/branches/jquery/applications/order/config/OrderUiLabels.xml
    
ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml
   (props changed)
    
ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
   (props changed)
    ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml
    
ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml
   (props changed)
    
ofbiz/branches/jquery/applications/workeffort/config/EventReminders.properties
    ofbiz/branches/jquery/applications/workeffort/data/WorkEffortTypeData.xml
    ofbiz/branches/jquery/applications/workeffort/servicedef/services.xml
    
ofbiz/branches/jquery/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java
    ofbiz/branches/jquery/framework/common/config/SecurityextUiLabels.xml
    ofbiz/branches/jquery/framework/common/webcommon/includes/countries.ftl
    ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml   (props 
changed)
    
ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java
    
ofbiz/branches/jquery/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.groovy
    
ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
    
ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
    
ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java
    ofbiz/branches/jquery/specialpurpose/ebaystore/lib/   (props changed)
    ofbiz/branches/jquery/specialpurpose/ecommerce/config/EcommerceUiLabels.xml
    
ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/blog/TextImage.ftl
    
ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy
   (props changed)
    
ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy
   (props changed)
    
ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy
   (props changed)
    ofbiz/branches/jquery/specialpurpose/myportal/config/MyPortalUiLabels.xml

Propchange: ofbiz/branches/jquery/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 30 09:10:22 2010
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:951708-1039648
+/ofbiz/trunk:951708-1040441

Modified: 
ofbiz/branches/jquery/applications/accounting/config/AccountingUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/accounting/config/AccountingUiLabels.xml?rev=1040443&r1=1040442&r2=1040443&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/accounting/config/AccountingUiLabels.xml 
(original)
+++ ofbiz/branches/jquery/applications/accounting/config/AccountingUiLabels.xml 
Tue Nov 30 09:10:22 2010
@@ -7846,7 +7846,7 @@
         <value xml:lang="zh_TW">支付閘道配置描述</value>
     </property>
     <property key="AccountingPaymentGatewayConfigTypeDescription">
-        <value xml:lang="de">Schnittstellentyp, Beschr.</value>
+        <!--value xml:lang="de">Schnittstellentyp, Beschr.</value--> <!-- 
duplicate -->
         <value 
xml:lang="de">Zahlungs-Gateway-Konfigurations-Art-Beschreibung</value>
         <value xml:lang="en">Payment Gateway Config Type Description</value>
         <value xml:lang="fr">Description des types de configuration de 
passerelle de paiement</value>
@@ -8846,9 +8846,6 @@
         <value xml:lang="en">Problem getting ShipmentItemBilling 
records</value>
         <value xml:lang="hi_IN">ShipmentItemBilling अभिलेखों 
के लिए समस्या हो रही</value>
     </property>
-    <property key="AccountingProblemGettingShipmentItemBilling">
-        <value xml:lang="en">Problem getting ShipmentItemBilling 
records</value>
-    </property>
     <property key="AccountingProblemLookingUpOrderItemBilling">
         <value xml:lang="en">Problem looking up OrderItemBilling records for 
${billFields}</value>
         <value xml:lang="es">Problema buscando Elemento de orden de 
facturación para ${billFields}</value>

Modified: ofbiz/branches/jquery/applications/content/config/ContentUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/config/ContentUiLabels.xml?rev=1040443&r1=1040442&r2=1040443&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/content/config/ContentUiLabels.xml 
(original)
+++ ofbiz/branches/jquery/applications/content/config/ContentUiLabels.xml Tue 
Nov 30 09:10:22 2010
@@ -155,7 +155,7 @@
         <value xml:lang="nl">Blog ingave ID</value>     
         <value xml:lang="pt_BR">ID de entrada de blog</value>
         <value xml:lang="zh">博客记录标识</value>
-        <value xml:lang="zh">部落格文章ID</value>
+        <value xml:lang="zh_TW">部落格文章ID</value>
     </property>
     <property key="ContentBlogEdit">
         <value xml:lang="da">Redigér en blog</value>

Modified: 
ofbiz/branches/jquery/applications/content/template/survey/genericsurvey.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/template/survey/genericsurvey.ftl?rev=1040443&r1=1040442&r2=1040443&view=diff
==============================================================================
--- 
ofbiz/branches/jquery/applications/content/template/survey/genericsurvey.ftl 
(original)
+++ 
ofbiz/branches/jquery/applications/content/template/survey/genericsurvey.ftl 
Tue Nov 30 09:10:22 2010
@@ -133,10 +133,7 @@ under the License.
     </select>
   <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "COUNTRY"/>
     <select name="${questionFieldName}">
-    <#assign countries = 
Static["org.ofbiz.common.CommonWorkers"].getCountryList(delegator)>
-    <#list countries as country>
-        <option 
value='${country.geoId}'>${country.get("geoName",locale)?default(country.geoId)}</option>
-    </#list>
+      
${screens.render("component://common/widget/CommonScreens.xml#countries")}
     </select>
   <#else/>
     <div class="tabletext">Unsupported question type : 
${surveyQuestionAndAppl.surveyQuestionTypeId}</div>

Modified: ofbiz/branches/jquery/applications/order/config/OrderUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/config/OrderUiLabels.xml?rev=1040443&r1=1040442&r2=1040443&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/branches/jquery/applications/order/config/OrderUiLabels.xml Tue Nov 
30 09:10:22 2010
@@ -4723,7 +4723,7 @@
     <property key="OrderMarketingPackageComposedBy">
         <value xml:lang="en">Marketing Package Composed by:</value>
         <value xml:lang="pt_BR">Pacote de marketing composto por:</value>
-        <value xml:lang="en">行銷包裝組合者:</value>
+        <value xml:lang="zh">行銷包裝組合者:</value>
     </property>
     <property key="OrderMethod">
         <value xml:lang="cs">Způsob</value>

Propchange: 
ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 30 09:10:22 2010
@@ -1,3 +1,3 @@
 
/ofbiz/branches/addbirt/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CheckoutMapProcs.xml:831210-885099,885686-886087
 
/ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:921280-927264
-/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-1039648
+/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-1040441

Propchange: 
ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 30 09:10:22 2010
@@ -1,3 +1,3 @@
 
/incubator/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:418499-490456
 
/ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:921280-927264
-/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-1039648
+/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-1040441

Modified: ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml?rev=1040443&r1=1040442&r2=1040443&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml 
(original)
+++ ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml Tue 
Nov 30 09:10:22 2010
@@ -6372,7 +6372,7 @@
     </property>
     <property key="PageTitleEditWebAnalyticsTypes">
         <value xml:lang="en">Edit Web Analytics Types</value>
-        <value xml:lang="en">Aggiorna tipi di analisi Web</value>
+        <value xml:lang="it">Aggiorna tipi di analisi Web</value>
     </property>
     <property key="PageTitleFacilityLocationGeoLocation">
         <value xml:lang="en">Facility Location GeoLocation</value>

Propchange: 
ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 30 09:10:22 2010
@@ -1,3 +1,3 @@
 
/ofbiz/branches/addbirt/applications/product/script/org/ofbiz/shipment/test/FacilityTests.xml:831210-885099,885686-886087
 
/ofbiz/branches/multitenant20100310/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:921280-927264
-/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-1039648
+/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-1040441

Modified: 
ofbiz/branches/jquery/applications/workeffort/config/EventReminders.properties
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/config/EventReminders.properties?rev=1040443&r1=1040442&r2=1040443&view=diff
==============================================================================
--- 
ofbiz/branches/jquery/applications/workeffort/config/EventReminders.properties 
(original)
+++ 
ofbiz/branches/jquery/applications/workeffort/config/EventReminders.properties 
Tue Nov 30 09:10:22 2010
@@ -17,6 +17,10 @@
 # under the License.
 ###############################################################################
 
+# NOTE: This property file is now deprecated, you should instead configure 
your email template
+# using the EmailTemplateSetting entity with the emailTemplateSettingId of 
"WEFF_EVENT_REMINDER".
+# An example can be found in 
applications/workeffort/data/WorkEffortTypeData.xml
+
 # The "from" address for emailed calendar event reminders
 [email protected]
 # The screen widget used for emailed calendar event reminders. The parameters 
Map

Modified: 
ofbiz/branches/jquery/applications/workeffort/data/WorkEffortTypeData.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/data/WorkEffortTypeData.xml?rev=1040443&r1=1040442&r2=1040443&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/workeffort/data/WorkEffortTypeData.xml 
(original)
+++ ofbiz/branches/jquery/applications/workeffort/data/WorkEffortTypeData.xml 
Tue Nov 30 09:10:22 2010
@@ -240,4 +240,7 @@ under the License.
     <ContactMechTypePurpose contactMechPurposeTypeId="ICAL_URL" 
contactMechTypeId="LDAP_ADDRESS"/>
     <ContactMechTypePurpose contactMechPurposeTypeId="ICAL_URL" 
contactMechTypeId="WEB_ADDRESS"/>
 
+    <!-- WorkEffort Email Template Settings -->
+    <EmailTemplateSetting emailTemplateSettingId="WEFF_EVENT_REMINDER" 
description="" fromAddress="[email protected]" subject="Event Reminder"
+            
bodyScreenLocation="component://workeffort/widget/WorkEffortScreens.xml#WorkEffortEventReminderEmail"/>
 </entity-engine-xml>

Modified: ofbiz/branches/jquery/applications/workeffort/servicedef/services.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/servicedef/services.xml?rev=1040443&r1=1040442&r2=1040443&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/workeffort/servicedef/services.xml 
(original)
+++ ofbiz/branches/jquery/applications/workeffort/servicedef/services.xml Tue 
Nov 30 09:10:22 2010
@@ -734,6 +734,12 @@ under the License.
             location="org.ofbiz.workeffort.workeffort.WorkEffortServices" 
invoke="processWorkEffortEventReminders" auth="true">
         <description>Process work effort event reminders. This service is run 
by the job scheduler.</description>
     </service>
+    <service name="processWorkEffortEventReminder" engine="java"
+            location="org.ofbiz.workeffort.workeffort.WorkEffortServices" 
invoke="processWorkEffortEventReminder" auth="true">
+        <description>Send a work effort event reminder</description>
+        <attribute name="reminder" mode="IN" type="GenericValue"/>
+        <attribute name="bodyParameters" mode="IN" type="Map"/>
+    </service>
     <service name="migrateWorkEffortEventReminders" engine="java"
             location="org.ofbiz.workeffort.workeffort.WorkEffortServices" 
invoke="migrateWorkEffortEventReminders" auth="true">
         <description>Migrate work effort event reminders. Run this service to 
update work effort reminders.</description>

Modified: 
ofbiz/branches/jquery/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java?rev=1040443&r1=1040442&r2=1040443&view=diff
==============================================================================
--- 
ofbiz/branches/jquery/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java
 (original)
+++ 
ofbiz/branches/jquery/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java
 Tue Nov 30 09:10:22 2010
@@ -56,6 +56,7 @@ import org.ofbiz.entity.util.EntityListI
 import org.ofbiz.entity.util.EntityUtil;
 import org.ofbiz.security.Security;
 import org.ofbiz.service.DispatchContext;
+import org.ofbiz.service.GenericServiceException;
 import org.ofbiz.service.LocalDispatcher;
 import org.ofbiz.service.ServiceUtil;
 import org.ofbiz.service.calendar.TemporalExpression;
@@ -879,6 +880,7 @@ public class WorkEffortServices {
      */
     public static Map<String, Object> 
processWorkEffortEventReminders(DispatchContext ctx, Map<String, ? extends 
Object> context) {
         Delegator delegator = ctx.getDelegator();
+        LocalDispatcher dispatcher = ctx.getDispatcher();
         Timestamp now = new Timestamp(System.currentTimeMillis());
         List<GenericValue> eventReminders = null;
         try {
@@ -909,6 +911,9 @@ public class WorkEffortServices {
             Locale locale = reminder.getString("localeId") == null ? 
Locale.getDefault() : new Locale(reminder.getString("localeId"));
             TimeZone timeZone = reminder.getString("timeZoneId") == null ? 
TimeZone.getDefault() : TimeZone.getTimeZone(reminder.getString("timeZoneId"));
             Map<String, Object> parameters = UtilMisc.toMap("locale", locale, 
"timeZone", timeZone, "workEffortId", reminder.get("workEffortId"));
+
+            Map<String, Object> processCtx = UtilMisc.toMap("reminder", 
reminder, "bodyParameters", parameters, "userLogin", context.get("userLogin"));
+
             Calendar cal = UtilDateTime.toCalendar(now, timeZone, locale);
             Timestamp reminderStamp = 
reminder.getTimestamp("reminderDateTime");
             Date eventDateTime = workEffort.getTimestamp("estimatedStartDate");
@@ -939,7 +944,8 @@ public class WorkEffortServices {
                     if (reminderDateTime.before(now) && reminderStamp != null) 
{
                         try {
                             parameters.put("eventDateTime", new 
Timestamp(eventDateTime.getTime()));
-                            processEventReminder(ctx, reminder, parameters);
+
+                            
dispatcher.runSync("processWorkEffortEventReminder", processCtx);
                             if (repeatCount != 0 && currentCount + 1 >= 
repeatCount) {
                                 reminder.remove();
                             } else {
@@ -961,6 +967,8 @@ public class WorkEffortServices {
                             }
                         } catch (GenericEntityException e) {
                             Debug.logWarning("Error while processing temporal 
expression reminder, id = " + tempExprId + ": " + e, module);
+                        } catch (GenericServiceException e) {
+                            Debug.logError(e, module);
                         }
                     } else if (reminderStamp == null) {
                         try {
@@ -978,7 +986,7 @@ public class WorkEffortServices {
                 if (reminderDateTime.before(now)) {
                     try {
                         parameters.put("eventDateTime", eventDateTime);
-                        processEventReminder(ctx, reminder, parameters);
+                        dispatcher.runSync("processWorkEffortEventReminder", 
processCtx);
                         TimeDuration duration = 
TimeDuration.fromNumber(reminder.getLong("repeatInterval"));
                         if ((repeatCount != 0 && currentCount + 1 >= 
repeatCount) || duration.isZero()) {
                             reminder.remove();
@@ -992,6 +1000,8 @@ public class WorkEffortServices {
                         }
                     } catch (GenericEntityException e) {
                         Debug.logWarning("Error while processing event 
reminder: " + e, module);
+                    } catch (GenericServiceException e) {
+                        Debug.logError(e, module);
                     }
                 }
             }
@@ -999,6 +1009,53 @@ public class WorkEffortServices {
         return ServiceUtil.returnSuccess();
     }
 
+    public static Map<String, Object> 
processWorkEffortEventReminder(DispatchContext dctx, Map<String, ? extends 
Object> context) {
+        LocalDispatcher dispatcher = dctx.getDispatcher();
+        Delegator delegator = dctx.getDelegator();
+        Map<String, Object> parameters = 
UtilGenerics.checkMap(context.get("bodyParameters"));
+        GenericValue reminder = (GenericValue) context.get("reminder");
+        GenericValue contactMech = null;
+        try {
+            contactMech = reminder.getRelatedOne("ContactMech");
+        } catch (GenericEntityException e) {
+            Debug.logError(e, module);
+        }
+        if (contactMech != null && 
"EMAIL_ADDRESS".equals(contactMech.get("contactMechTypeId"))) {
+            String toAddress = contactMech.getString("infoString");
+
+            GenericValue emailTemplateSetting = null;
+            try {
+                emailTemplateSetting = 
delegator.findOne("EmailTemplateSetting", true, "emailTemplateSettingId", 
"WEFF_EVENT_REMINDER");
+            } catch (GenericEntityException e1) {
+                Debug.logError(e1, module);
+            }
+            if (emailTemplateSetting != null) {
+                Map<String, Object> emailCtx = 
UtilMisc.toMap("emailTemplateSettingId", "WEFF_EVENT_REMINDER", "sendTo", 
toAddress, "bodyParameters", parameters);
+                try {
+                    dispatcher.runAsync("sendMailFromTemplateSetting", 
emailCtx);
+                } catch (Exception e) {
+                    Debug.logWarning("Error while emailing event reminder - 
workEffortId = " + reminder.get("workEffortId") + ", contactMechId = " + 
reminder.get("contactMechId") + ": " + e, module);
+                }
+            } else {
+                // TODO: Remove this block after the next release 2010-11-29
+                String screenLocation = 
UtilProperties.getPropertyValue("EventReminders", 
"eventReminders.emailScreenWidgetLocation");
+                String fromAddress = 
UtilProperties.getPropertyValue("EventReminders", 
"eventReminders.emailFromAddress");
+                String subject = 
UtilProperties.getMessage("WorkEffortUiLabels", "WorkEffortEventReminder", 
(Locale) parameters.get("locale"));
+                Map<String, Object> emailCtx = UtilMisc.toMap("sendFrom", 
fromAddress, "sendTo", toAddress, "subject", subject, "bodyParameters", 
parameters, "bodyScreenUri", screenLocation);
+                try {
+                    dispatcher.runAsync("sendMailFromScreen", emailCtx);
+                } catch (Exception e) {
+                    Debug.logWarning("Error while emailing event reminder - 
workEffortId = " + reminder.get("workEffortId") + ", contactMechId = " + 
reminder.get("contactMechId") + ": " + e, module);
+                }
+            }
+            return ServiceUtil.returnSuccess();
+        }
+        // TODO: Other contact mechanism types
+        Debug.logWarning("Invalid event reminder contact mech, workEffortId = 
" + reminder.get("workEffortId") + ", contactMechId = " + 
reminder.get("contactMechId"), module);
+        return ServiceUtil.returnSuccess();
+    }
+
+    @Deprecated
     protected static void processEventReminder(DispatchContext ctx, 
GenericValue reminder, Map<String, Object> parameters) throws 
GenericEntityException {
         LocalDispatcher dispatcher = ctx.getDispatcher();
         GenericValue contactMech = reminder.getRelatedOne("ContactMech");

Modified: ofbiz/branches/jquery/framework/common/config/SecurityextUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/config/SecurityextUiLabels.xml?rev=1040443&r1=1040442&r2=1040443&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/common/config/SecurityextUiLabels.xml 
(original)
+++ ofbiz/branches/jquery/framework/common/config/SecurityextUiLabels.xml Tue 
Nov 30 09:10:22 2010
@@ -336,7 +336,7 @@
         <value xml:lang="ru">Пользователь с именем 
"${username}" заблокирован.</value>
         <value 
xml:lang="th">บัญชีสำหรับรหัสการลอกอินเข้าสู่ระบบของผู้ใช้
 "${username}" ไม่สามารถ.</value>
         <value 
xml:lang="zh">用户登录标识为"${username}"的账户已被禁用。</value>
-        <value xml:lang="zh">使用者帳戶 "${username}" 
已被停用。</value>
+        <value xml:lang="zh_TW">使用者帳戶 "${username}" 
已被停用。</value>
     </property>
     <property key="loginservices.could_not_change_password_read_failure">
         <value xml:lang="de">Das Passwort konnte nicht geändert werden 
(Lesefehler): ${errorMessage}.</value>

Modified: 
ofbiz/branches/jquery/framework/common/webcommon/includes/countries.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/webcommon/includes/countries.ftl?rev=1040443&r1=1040442&r2=1040443&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/common/webcommon/includes/countries.ftl 
(original)
+++ ofbiz/branches/jquery/framework/common/webcommon/includes/countries.ftl Tue 
Nov 30 09:10:22 2010
@@ -16,11 +16,8 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-<#assign
-    countries = 
Static["org.ofbiz.common.CommonWorkers"].getCountryList(delegator)
-    defaultCountryId = 
Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("general","country.geo.id.default")
->
+<#assign countries = 
Static["org.ofbiz.common.CommonWorkers"].getCountryList(delegator)>
 <#list countries as country>
-    <option value='${country.geoId}'<#if country.geoId == defaultCountryId> 
selected="selected"</#if>>${country.get("geoName",locale)?default(country.geoId)}</option>
+    <option 
value='${country.geoId}'>${country.get("geoName",locale)?default(country.geoId)}</option>
 </#list>
 

Propchange: ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 30 09:10:22 2010
@@ -1,3 +1,3 @@
 
/ofbiz/branches/addbirt/applications/commonext/widget/HelpScreens.xml:831210-885099,885686-886087
 
/ofbiz/branches/multitenant20100310/framework/common/widget/HelpScreens.xml:921280-927264
-/ofbiz/trunk/framework/common/widget/HelpScreens.xml:951708-1039648
+/ofbiz/trunk/framework/common/widget/HelpScreens.xml:951708-1040441

Modified: 
ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java?rev=1040443&r1=1040442&r2=1040443&view=diff
==============================================================================
--- 
ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java
 (original)
+++ 
ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java
 Tue Nov 30 09:10:22 2010
@@ -221,6 +221,7 @@ public class RequestHandler {
                     if (newUrl.toUpperCase().startsWith("HTTPS")) {
                         // if we are supposed to be secure, redirect secure.
                         callRedirect(newUrl, response, request);
+                        return;
                     }
                 }
             // if this is a new session and forceHttpSession is true and the 
request is secure but does not
@@ -235,6 +236,7 @@ public class RequestHandler {
                 String newUrl = RequestHandler.makeUrl(request, response, 
urlBuf.toString(), true, false, false);
                 if (newUrl.toUpperCase().startsWith("HTTP")) {
                     callRedirect(newUrl, response, request);
+                    return;
                 }
             }
 

Modified: 
ofbiz/branches/jquery/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.groovy
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.groovy?rev=1040443&r1=1040442&r2=1040443&view=diff
==============================================================================
--- 
ofbiz/branches/jquery/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.groovy
 (original)
+++ 
ofbiz/branches/jquery/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.groovy
 Tue Nov 30 09:10:22 2010
@@ -28,6 +28,7 @@ import org.ofbiz.entity.model.ModelField
 import org.ofbiz.entity.model.ModelFieldType;
 import org.ofbiz.entity.GenericEntity;
 import org.ofbiz.base.util.UtilFormatOut;
+import org.ofbiz.base.util.UtilProperties;
 import org.ofbiz.entity.condition.EntityExpr;
 import org.ofbiz.entity.condition.EntityCondition;
 import org.ofbiz.entity.condition.EntityConditionList;
@@ -122,7 +123,7 @@ context.viewIndexNext = viewIndex+1;
 try {
     viewSize = Integer.valueOf((String)parameters.get("VIEW_SIZE")).intValue();
 } catch (NumberFormatException nfe) {
-    viewSize = 10;
+    viewSize = 
Integer.valueOf(UtilProperties.getPropertyValue("widget.properties", 
"widget.form.defaultViewSize")).intValue();
 }
 
 context.viewSize = viewSize;

Modified: 
ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java?rev=1040443&r1=1040442&r2=1040443&view=diff
==============================================================================
--- 
ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
 (original)
+++ 
ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
 Tue Nov 30 09:10:22 2010
@@ -3056,10 +3056,8 @@ public class MacroFormRenderer implement
         executeMacro(writer, sr.toString());
     }
 
-    public void renderContainerFindField(Appendable writer,
-            Map<String, Object> context, ContainerField containerField)
-            throws IOException {
-        String id = containerField.getId();
+    public void renderContainerFindField(Appendable writer, Map<String, 
Object> context, ContainerField containerField) throws IOException {
+        String id = containerField.getModelFormField().getIdName();
         String className = 
UtilFormatOut.checkNull(containerField.getModelFormField().getWidgetStyle());
 
         StringWriter sr = new StringWriter();

Modified: 
ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java?rev=1040443&r1=1040442&r2=1040443&view=diff
==============================================================================
--- 
ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
 (original)
+++ 
ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
 Tue Nov 30 09:10:22 2010
@@ -1115,7 +1115,7 @@ public class ModelFormField {
         ModelForm modelForm = this.getModelForm();
         if (modelForm != null) {
             Integer itemIndex = (Integer) context.get("itemIndex");
-            if (modelForm != null && ("list".equals(modelForm.getType()) || 
"multi".equals(modelForm.getType() ))) {
+            if ("list".equals(modelForm.getType()) || 
"multi".equals(modelForm.getType() )) {
                 if (itemIndex != null) {
                     return this.getIdName() + 
modelForm.getItemIndexSeparator() + itemIndex.intValue();
                 }
@@ -2121,7 +2121,7 @@ public class ModelFormField {
             String retVal = null;
             if (this.description != null && !this.description.isEmpty()) {
                 retVal = this.description.expandString(context);
-                if (retVal != null) {
+                if (retVal != null && 
this.getModelFormField().getEncodeOutput()) {
                     StringUtil.SimpleEncoder simpleEncoder = 
(StringUtil.SimpleEncoder) context.get("simpleEncoder");
                     if (simpleEncoder != null) {
                         retVal = simpleEncoder.encode(retVal);
@@ -2305,9 +2305,6 @@ public class ModelFormField {
         public void setSubHyperlink(SubHyperlink newSubHyperlink) {
             this.subHyperlink = newSubHyperlink;
         }
-        public String getSize(){
-            return this.size;
-        }
     }
 
     public static class HyperlinkField extends FieldInfo {
@@ -3901,6 +3898,7 @@ public class ModelFormField {
     }
 
     public static class ContainerField extends FieldInfo {
+        @Deprecated
         protected String id;
 
         public ContainerField() {
@@ -3909,25 +3907,23 @@ public class ModelFormField {
 
         public ContainerField(Element element, ModelFormField modelFormField) {
             super(element, modelFormField);
-            this.setId(modelFormField.getIdName());
         }
 
-        public ContainerField(int fieldSource, int fieldType,
-                ModelFormField modelFormField) {
+        public ContainerField(int fieldSource, int fieldType, ModelFormField 
modelFormField) {
             super(fieldSource, fieldType, modelFormField);
         }
 
         @Override
-        public void renderFieldString(Appendable writer,
-                Map<String, Object> context,
-                FormStringRenderer formStringRenderer) throws IOException {
+        public void renderFieldString(Appendable writer, Map<String, Object> 
context, FormStringRenderer formStringRenderer) throws IOException {
             formStringRenderer.renderContainerFindField(writer, context, this);
         }
 
+        @Deprecated
         public String getId() {
             return id;
         }
 
+        @Deprecated
         public void setId(String id) {
             this.id = id;
         }

Modified: 
ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java?rev=1040443&r1=1040442&r2=1040443&view=diff
==============================================================================
--- 
ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java
 (original)
+++ 
ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java
 Tue Nov 30 09:10:22 2010
@@ -2919,7 +2919,7 @@ public class HtmlFormRenderer extends Ht
     
     public void renderContainerFindField(Appendable writer, Map<String, 
Object> context, ContainerField containerField) throws IOException {
         writer.append("<div ");
-        String id = containerField.getId();
+        String id = containerField.getModelFormField().getIdName();
         if (UtilValidate.isNotEmpty(id)) {
             writer.append("id=\"");
             writer.append(id);

Propchange: ofbiz/branches/jquery/specialpurpose/ebaystore/lib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 30 09:10:22 2010
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt/specialpurpose/ebay/lib:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/lib:921280-927264
-/ofbiz/trunk/specialpurpose/ebaystore/lib:951708-1039648
+/ofbiz/trunk/specialpurpose/ebaystore/lib:951708-1040441

Modified: 
ofbiz/branches/jquery/specialpurpose/ecommerce/config/EcommerceUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/config/EcommerceUiLabels.xml?rev=1040443&r1=1040442&r2=1040443&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/ecommerce/config/EcommerceUiLabels.xml 
(original)
+++ ofbiz/branches/jquery/specialpurpose/ecommerce/config/EcommerceUiLabels.xml 
Tue Nov 30 09:10:22 2010
@@ -4476,7 +4476,6 @@
         <value xml:lang="zh">订单摘要 - 谢谢你的惠顾！</value>
         <value xml:lang="zh_TW">訂單摘要 - 謝謝你的惠顧！</value>
     </property>
-        <value xml:lang="zh_TW">產品頁面</value>
     <property key="PageTitleProductReview">
         <value xml:lang="cs">Výrobek - přehled</value>
         <value xml:lang="da">Produktgennemgang</value>
@@ -4494,7 +4493,7 @@
         <value xml:lang="th">ตรวจสอบสินค้า</value>
         <value xml:lang="zh">产品评价</value>
         <value xml:lang="zh_TW">產品評論</value>
-        <value xml:lang="zh_TW">產品評價</value>
+        <!--value xml:lang="zh_TW">產品評價</value--> <!-- duplicate -->
     </property>
     <property key="PageTitleProfileSurvey">
         <value xml:lang="da">Profil rundspørge</value>
@@ -4511,7 +4510,7 @@
         <value xml:lang="th">สำรวจประวัติ</value>
         <value xml:lang="zh">简介调查</value>
         <value xml:lang="zh_TW">問卷簡介</value>
-        <value xml:lang="zh_TW">快速增加</value>
+        <!--value xml:lang="zh_TW">快速增加</value--> <!-- duplicate -->
     </property>
     <property key="PageTitleRequestReturn">
         <value xml:lang="cs">Odpověď na poptávku</value>

Modified: 
ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/blog/TextImage.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/blog/TextImage.ftl?rev=1040443&r1=1040442&r2=1040443&view=diff
==============================================================================
--- 
ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/blog/TextImage.ftl
 (original)
+++ 
ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/blog/TextImage.ftl
 Tue Nov 30 09:10:22 2010
@@ -88,7 +88,7 @@
         <div class="inputBox"><input type="checkBox" ${text_check} 
name="drMimeTypeId_TEXT" value="Y"/>Text</div>
         </td>
         <td>&nbsp;</td>
-        <td width="60%"
+        <td width="60%">
         <textarea class="textAreaBox" class="inputBox" name="textData" 
cols="60" rows="24">${textData?if_exists}</textarea>
         </td>
         <td width="10%" align="right">

Propchange: 
ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 30 09:10:22 2010
@@ -1,3 +1,3 @@
 
/incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:418499-490456
 
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-1039648
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-1040441

Propchange: 
ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 30 09:10:22 2010
@@ -1,3 +1,3 @@
 
/incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:418499-490456
 
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-1039648
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-1040441

Propchange: 
ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 30 09:10:22 2010
@@ -1,3 +1,3 @@
 
/incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:418499-490456
 
/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-927264
-/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-1039648
+/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-1040441

Modified: 
ofbiz/branches/jquery/specialpurpose/myportal/config/MyPortalUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/myportal/config/MyPortalUiLabels.xml?rev=1040443&r1=1040442&r2=1040443&view=diff
==============================================================================
--- ofbiz/branches/jquery/specialpurpose/myportal/config/MyPortalUiLabels.xml 
(original)
+++ ofbiz/branches/jquery/specialpurpose/myportal/config/MyPortalUiLabels.xml 
Tue Nov 30 09:10:22 2010
@@ -71,9 +71,6 @@
         <value xml:lang="en">My Orders</value>
         <value xml:lang="zh_TW">我的訂單</value>
     </property>
-        <value xml:lang="zh_TW">我的任務</value>
-        <value xml:lang="zh_TW">我的時間</value>
-        <value xml:lang="zh_TW">新的訊息</value>
     <property key="MyPortalNewRegistration">
         <value xml:lang="en">New Registration </value>
         <value xml:lang="fr">Nouvel enregistrement</value>
@@ -108,7 +105,6 @@
         <value xml:lang="zh">刷新图片</value>
         <value xml:lang="zh_TW">重載圖片</value>
     </property>
-        <value 
xml:lang="zh_TW">發送電子郵件給所有客戶要求變更</value>
     <property key="MyPortalShipToCustomer">
         <value xml:lang="en">Ship To Customer</value>
         <value xml:lang="zh_TW">寄送給客戶</value>

Reply via email to