svn commit: r1128865 [10/27] - in /ofbiz/branches/jackrabbit2010
Locked
svn commit: r1128865 [10/27] - in /ofbiz/branches/jackrabbit2010
 
|
Modified: ofbiz/branches/jackrabbit20100709/framework/common/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/servicedef/services.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/servicedef/services.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/servicedef/services.xml Sun May 29 11:02:09 2011 @@ -324,6 +324,8 @@ under the License. <attribute name="conversionParameters" mode="IN" type="Map" optional="true"/> <attribute name="purposeEnumId" mode="IN" type="String" optional="true"/> <attribute name="convertedValue" mode="OUT" type="BigDecimal" optional="true"/> + <attribute name="defaultDecimalScale" mode="IN" type="Long" optional="true"/> + <attribute name="defaultRoundingMode" mode="IN" type="String" optional="true"/> </service> <service name="convertUomCustom" default-entity-name="UomConversion" engine="simple" location="component://common/script/org/ofbiz/common/CommonServices.xml" invoke="convertUomCustom" auth="false"> Modified: ofbiz/branches/jackrabbit20100709/framework/common/servicedef/services_security.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/servicedef/services_security.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/servicedef/services_security.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/servicedef/services_security.xml Sun May 29 11:02:09 2011 @@ -97,7 +97,7 @@ under the License. <permission-service service-name="securityPermissionCheck" main-action="CREATE"/> <attribute name="viewNameId" type="String" mode="IN" optional="false"/> <attribute name="groupId" type="String" mode="IN" optional="false"/> - <attribute name="maxHits" type="Integer" mode="IN" optional="false"/> + <attribute name="maxHits" type="Long" mode="IN" optional="false"/> <attribute name="maxHitsDuration" type="Long" mode="IN" optional="false"/> <attribute name="tarpitDuration" type="Long" mode="IN" optional="false"/> </service> @@ -106,7 +106,7 @@ under the License. <permission-service service-name="securityPermissionCheck" main-action="UPDATE"/> <attribute name="viewNameId" type="String" mode="IN" optional="false"/> <attribute name="groupId" type="String" mode="IN" optional="false"/> - <attribute name="maxHits" type="Integer" mode="IN" optional="false"/> + <attribute name="maxHits" type="Long" mode="IN" optional="false"/> <attribute name="maxHitsDuration" type="Long" mode="IN" optional="false"/> <attribute name="tarpitDuration" type="Long" mode="IN" optional="false"/> </service> Modified: ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/CommonServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/CommonServices.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/CommonServices.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/CommonServices.java Sun May 29 11:02:09 2011 @@ -203,7 +203,7 @@ public class CommonServices { /** * Service for setting debugging levels. - *@param dctx The DispatchContext that this service is operating in + *@param dctc The DispatchContext that this service is operating in *@param context Map containing the input parameters *@return Map with the result of the service, the output parameters */ Modified: ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/FindServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/FindServices.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/FindServices.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/FindServices.java Sun May 29 11:02:09 2011 @@ -210,7 +210,7 @@ public class FindServices { * @param queryStringMap * @param delegator * @param context - * @return + * @return returns an EntityCondition list */ public static List<EntityCondition> createConditionList(Map<String, ? extends Object> parameters, List<ModelField> fieldList, Map<String, Object> queryStringMap, Delegator delegator, Map<String, ?> context) { Set<String> processed = FastSet.newInstance(); @@ -287,7 +287,7 @@ public class FindServices { * @param ignoreCase * @param delegator * @param context - * @return + * @return return an EntityCondition */ public static EntityCondition createSingleCondition(ModelField modelField, String operation, Object fieldValue, boolean ignoreCase, Delegator delegator, Map<String, ?> context) { EntityCondition cond = null; @@ -350,8 +350,8 @@ public class FindServices { * * This is use to the generic method that expects entity data affixed with special suffixes * to indicate their purpose in formulating an SQL query statement. - * @param keys list of field for which it's possible to make the query - * @param normalizedFields list of field the user have populated + * @param modelEntity the model entity object + * @param normalizedFields list of field the user have populated * @return a arrayList usable to create an entityCondition */ public static List<EntityCondition> createCondition(ModelEntity modelEntity, Map<String, Map<String, Map<String, Object>>> normalizedFields, Map<String, Object> queryStringMap, Map<String, List<Object[]>> origValueMap, Delegator delegator, Map<String, ?> context) { @@ -709,7 +709,7 @@ public class FindServices { * * @param dctx * @param context - * @return + * @return returns the first item */ public static Map<String, Object> performFindItem(DispatchContext dctx, Map<String, Object> context) { context.put("viewSize", 1); Modified: ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java Sun May 29 11:02:09 2011 @@ -31,13 +31,18 @@ public class JsLanguageFileMappingCreato List<Locale> localeList = UtilMisc.availableLocales(); Map<String, Object> jQueryLocaleFile = FastMap.newInstance(); Map<String, String> dateJsLocaleFile = FastMap.newInstance(); + Map<String, String> validationLocaleFile = FastMap.newInstance(); + //Map<String, String> validationMethodsLocaleFile = FastMap.newInstance(); // setup some variables to locate the js files String componentRoot = "component://images/webapp"; String jqueryUiLocaleRelPath = "/images/jquery/ui/development-bundle/ui/i18n/"; String dateJsLocaleRelPath = "/images/jquery/plugins/datejs/"; + String validateRelPath = "/images/jquery/plugins/validate/localization/"; String jsFilePostFix = ".js"; String dateJsLocalePrefix = "date-"; + String validateLocalePrefix = "messages_"; + //String validateMethLocalePrefix = "methods__"; String jqueryUiLocalePrefix = "jquery.ui.datepicker-"; String defaultLocaleDateJs = "en-US"; String defaultLocaleJquery = "en"; @@ -86,6 +91,23 @@ public class JsLanguageFileMappingCreato fileUrl = null; /* + * Try to open the jquery validation language file + */ + fileName = componentRoot + validateRelPath + validateLocalePrefix + strippedLocale + jsFilePostFix; + file = FileUtil.getFile(fileName); + + if (file.exists()) { + fileUrl = validateRelPath + validateLocalePrefix + strippedLocale + jsFilePostFix; + } + + if (fileUrl == null) { + fileUrl = validateRelPath + validateLocalePrefix + defaultLocaleJquery + jsFilePostFix; + } + validationLocaleFile.put(displayCountry, fileUrl); + + fileUrl = null; + + /* * Try to open the jquery timepicker language file */ file = null; @@ -118,6 +140,7 @@ public class JsLanguageFileMappingCreato Map<String, Object> mapWrapper = new HashMap<String, Object>(); mapWrapper.put("datejs", dateJsLocaleFile); mapWrapper.put("jquery", jQueryLocaleFile); + mapWrapper.put("validation", validationLocaleFile); // some magic to create a new java file // render it as FTL Modified: ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/JsLanguageFilesMapping.java Sun May 29 11:02:09 2011 @@ -67,7 +67,7 @@ public final class JsLanguageFilesMappin localeFiles.put("hr_HR", "/images/jquery/plugins/datejs/date-hr-HR.js"); localeFiles.put("cs", "/images/jquery/plugins/datejs/date-en-US.js"); localeFiles.put("cs_CZ", "/images/jquery/plugins/datejs/date-cs-CZ.js"); - localeFiles.put("da", "/images/jquery/plugins/datejs/date-en-US.js"); + localeFiles.put("da", "/images/jquery/plugins/datejs/date-da-DA.js"); localeFiles.put("da_DK", "/images/jquery/plugins/datejs/date-da-DK.js"); localeFiles.put("nl", "/images/jquery/plugins/datejs/date-nl-NL.js"); localeFiles.put("nl_BE", "/images/jquery/plugins/datejs/date-nl-BE.js"); @@ -362,4 +362,172 @@ public final class JsLanguageFilesMappin } } + + public static class validation { + private static Map<String, String> localeFiles = FastMap.newInstance(); + private static String defaultValidation = "/images/webapp/images/jquery/plugins/validate/localization/messages_en.js"; + + static { + localeFiles.put("sq", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("sq_AL", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("ar", "/images/jquery/plugins/validate/localization/messages_ar.js"); + localeFiles.put("ar_DZ", "/images/jquery/plugins/validate/localization/messages_ar.js"); + localeFiles.put("ar_BH", "/images/jquery/plugins/validate/localization/messages_ar.js"); + localeFiles.put("ar_EG", "/images/jquery/plugins/validate/localization/messages_ar.js"); + localeFiles.put("ar_IQ", "/images/jquery/plugins/validate/localization/messages_ar.js"); + localeFiles.put("ar_JO", "/images/jquery/plugins/validate/localization/messages_ar.js"); + localeFiles.put("ar_KW", "/images/jquery/plugins/validate/localization/messages_ar.js"); + localeFiles.put("ar_LB", "/images/jquery/plugins/validate/localization/messages_ar.js"); + localeFiles.put("ar_LY", "/images/jquery/plugins/validate/localization/messages_ar.js"); + localeFiles.put("ar_MA", "/images/jquery/plugins/validate/localization/messages_ar.js"); + localeFiles.put("ar_OM", "/images/jquery/plugins/validate/localization/messages_ar.js"); + localeFiles.put("ar_QA", "/images/jquery/plugins/validate/localization/messages_ar.js"); + localeFiles.put("ar_SA", "/images/jquery/plugins/validate/localization/messages_ar.js"); + localeFiles.put("ar_SD", "/images/jquery/plugins/validate/localization/messages_ar.js"); + localeFiles.put("ar_SY", "/images/jquery/plugins/validate/localization/messages_ar.js"); + localeFiles.put("ar_TN", "/images/jquery/plugins/validate/localization/messages_ar.js"); + localeFiles.put("ar_AE", "/images/jquery/plugins/validate/localization/messages_ar.js"); + localeFiles.put("ar_YE", "/images/jquery/plugins/validate/localization/messages_ar.js"); + localeFiles.put("be", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("be_BY", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("bg", "/images/jquery/plugins/validate/localization/messages_bg.js"); + localeFiles.put("bg_BG", "/images/jquery/plugins/validate/localization/messages_bg.js"); + localeFiles.put("ca", "/images/jquery/plugins/validate/localization/messages_ca.js"); + localeFiles.put("ca_ES", "/images/jquery/plugins/validate/localization/messages_ca.js"); + localeFiles.put("zh", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("zh_CN", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("zh_HK", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("zh_SG", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("zh_TW", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("hr", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("hr_HR", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("cs", "/images/jquery/plugins/validate/localization/messages_cs.js"); + localeFiles.put("cs_CZ", "/images/jquery/plugins/validate/localization/messages_cs.js"); + localeFiles.put("da", "/images/jquery/plugins/validate/localization/messages_da.js"); + localeFiles.put("da_DK", "/images/jquery/plugins/validate/localization/messages_da.js"); + localeFiles.put("nl", "/images/jquery/plugins/validate/localization/messages_nl.js"); + localeFiles.put("nl_BE", "/images/jquery/plugins/validate/localization/messages_nl.js"); + localeFiles.put("nl_NL", "/images/jquery/plugins/validate/localization/messages_nl.js"); + localeFiles.put("en", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("en_AU", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("en_CA", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("en_IN", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("en_IE", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("en_MT", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("en_NZ", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("en_PH", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("en_SG", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("en_ZA", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("en_GB", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("en_US", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("et", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("et_EE", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("fi", "/images/jquery/plugins/validate/localization/messages_fi.js"); + localeFiles.put("fi_FI", "/images/jquery/plugins/validate/localization/messages_fi.js"); + localeFiles.put("fr", "/images/jquery/plugins/validate/localization/messages_fr.js"); + localeFiles.put("fr_BE", "/images/jquery/plugins/validate/localization/messages_fr.js"); + localeFiles.put("fr_CA", "/images/jquery/plugins/validate/localization/messages_fr.js"); + localeFiles.put("fr_FR", "/images/jquery/plugins/validate/localization/messages_fr.js"); + localeFiles.put("fr_LU", "/images/jquery/plugins/validate/localization/messages_fr.js"); + localeFiles.put("fr_CH", "/images/jquery/plugins/validate/localization/messages_fr.js"); + localeFiles.put("de", "/images/jquery/plugins/validate/localization/messages_de.js"); + localeFiles.put("de_AT", "/images/jquery/plugins/validate/localization/messages_de.js"); + localeFiles.put("de_DE", "/images/jquery/plugins/validate/localization/messages_de.js"); + localeFiles.put("de_LU", "/images/jquery/plugins/validate/localization/messages_de.js"); + localeFiles.put("de_CH", "/images/jquery/plugins/validate/localization/messages_de.js"); + localeFiles.put("el", "/images/jquery/plugins/validate/localization/messages_el.js"); + localeFiles.put("el_CY", "/images/jquery/plugins/validate/localization/messages_el.js"); + localeFiles.put("el_GR", "/images/jquery/plugins/validate/localization/messages_el.js"); + localeFiles.put("iw", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("iw_IL", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("hi_IN", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("hu", "/images/jquery/plugins/validate/localization/messages_hu.js"); + localeFiles.put("hu_HU", "/images/jquery/plugins/validate/localization/messages_hu.js"); + localeFiles.put("is", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("is_IS", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("in", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("in_ID", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("ga", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("ga_IE", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("it", "/images/jquery/plugins/validate/localization/messages_it.js"); + localeFiles.put("it_IT", "/images/jquery/plugins/validate/localization/messages_it.js"); + localeFiles.put("it_CH", "/images/jquery/plugins/validate/localization/messages_it.js"); + localeFiles.put("ja", "/images/jquery/plugins/validate/localization/messages_ja.js"); + localeFiles.put("ja_JP", "/images/jquery/plugins/validate/localization/messages_ja.js"); + localeFiles.put("ja_JP_JP", "/images/jquery/plugins/validate/localization/messages_ja.js"); + localeFiles.put("ko", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("ko_KR", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("lv", "/images/jquery/plugins/validate/localization/messages_lv.js"); + localeFiles.put("lv_LV", "/images/jquery/plugins/validate/localization/messages_lv.js"); + localeFiles.put("lt", "/images/jquery/plugins/validate/localization/messages_lt.js"); + localeFiles.put("lt_LT", "/images/jquery/plugins/validate/localization/messages_lt.js"); + localeFiles.put("mk", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("mk_MK", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("ms", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("ms_MY", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("mt", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("mt_MT", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("no", "/images/jquery/plugins/validate/localization/messages_no.js"); + localeFiles.put("no_NO", "/images/jquery/plugins/validate/localization/messages_no.js"); + localeFiles.put("no_NO_NY", "/images/jquery/plugins/validate/localization/messages_no.js"); + localeFiles.put("pl", "/images/jquery/plugins/validate/localization/messages_pl.js"); + localeFiles.put("pl_PL", "/images/jquery/plugins/validate/localization/messages_pl.js"); + localeFiles.put("pt", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("pt_BR", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("pt_PT", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("ro", "/images/jquery/plugins/validate/localization/messages_ro.js"); + localeFiles.put("ro_RO", "/images/jquery/plugins/validate/localization/messages_ro.js"); + localeFiles.put("ru", "/images/jquery/plugins/validate/localization/messages_ru.js"); + localeFiles.put("ru_RU", "/images/jquery/plugins/validate/localization/messages_ru.js"); + localeFiles.put("sr", "/images/jquery/plugins/validate/localization/messages_sr.js"); + localeFiles.put("sr_BA", "/images/jquery/plugins/validate/localization/messages_sr.js"); + localeFiles.put("sr_ME", "/images/jquery/plugins/validate/localization/messages_sr.js"); + localeFiles.put("sr_CS", "/images/jquery/plugins/validate/localization/messages_sr.js"); + localeFiles.put("sr_RS", "/images/jquery/plugins/validate/localization/messages_sr.js"); + localeFiles.put("sk", "/images/jquery/plugins/validate/localization/messages_sk.js"); + localeFiles.put("sk_SK", "/images/jquery/plugins/validate/localization/messages_sk.js"); + localeFiles.put("sl", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("sl_SI", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("es", "/images/jquery/plugins/validate/localization/messages_es.js"); + localeFiles.put("es_AR", "/images/jquery/plugins/validate/localization/messages_es.js"); + localeFiles.put("es_BO", "/images/jquery/plugins/validate/localization/messages_es.js"); + localeFiles.put("es_CL", "/images/jquery/plugins/validate/localization/messages_es.js"); + localeFiles.put("es_CO", "/images/jquery/plugins/validate/localization/messages_es.js"); + localeFiles.put("es_CR", "/images/jquery/plugins/validate/localization/messages_es.js"); + localeFiles.put("es_DO", "/images/jquery/plugins/validate/localization/messages_es.js"); + localeFiles.put("es_EC", "/images/jquery/plugins/validate/localization/messages_es.js"); + localeFiles.put("es_SV", "/images/jquery/plugins/validate/localization/messages_es.js"); + localeFiles.put("es_GT", "/images/jquery/plugins/validate/localization/messages_es.js"); + localeFiles.put("es_HN", "/images/jquery/plugins/validate/localization/messages_es.js"); + localeFiles.put("es_MX", "/images/jquery/plugins/validate/localization/messages_es.js"); + localeFiles.put("es_NI", "/images/jquery/plugins/validate/localization/messages_es.js"); + localeFiles.put("es_PA", "/images/jquery/plugins/validate/localization/messages_es.js"); + localeFiles.put("es_PY", "/images/jquery/plugins/validate/localization/messages_es.js"); + localeFiles.put("es_PE", "/images/jquery/plugins/validate/localization/messages_es.js"); + localeFiles.put("es_PR", "/images/jquery/plugins/validate/localization/messages_es.js"); + localeFiles.put("es_ES", "/images/jquery/plugins/validate/localization/messages_es.js"); + localeFiles.put("es_US", "/images/jquery/plugins/validate/localization/messages_es.js"); + localeFiles.put("es_UY", "/images/jquery/plugins/validate/localization/messages_es.js"); + localeFiles.put("es_VE", "/images/jquery/plugins/validate/localization/messages_es.js"); + localeFiles.put("sv", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("sv_SE", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("th", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("th_TH", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("th_TH_TH", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("tr", "/images/jquery/plugins/validate/localization/messages_tr.js"); + localeFiles.put("tr_TR", "/images/jquery/plugins/validate/localization/messages_tr.js"); + localeFiles.put("uk", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("uk_UA", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("vi", "/images/jquery/plugins/validate/localization/messages_en.js"); + localeFiles.put("vi_VN", "/images/jquery/plugins/validate/localization/messages_en.js"); + } + + public static String getFilePath(String locale) { + if (validation.localeFiles.get(locale) == null) { + return validation.defaultValidation; + } + return validation.localeFiles.get(locale); + } + + } } Modified: ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/authentication/AuthenticationComparator.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/authentication/AuthenticationComparator.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/authentication/AuthenticationComparator.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/authentication/AuthenticationComparator.java Sun May 29 11:02:09 2011 @@ -54,8 +54,8 @@ public class AuthenticationComparator im * this fact. The recommended language is "Note: this comparator * imposes orderings that are inconsistent with equals." * - * @param o1 the first object to be compared. - * @param o2 the second object to be compared. + * @param a1 the first object to be compared. + * @param a2 the second object to be compared. * @return a negative integer, zero, or a positive integer as the * first argument is less than, equal to, or greater than the * second. Modified: ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/image/ImageTransform.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/image/ImageTransform.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/image/ImageTransform.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/image/ImageTransform.java Sun May 29 11:02:09 2011 @@ -63,9 +63,8 @@ public class ImageTransform { * <p> * Set a buffered image * - * @param context * @param fileLocation Full file Path or URL - * @return URL images for all different size types + * @return URL images for all different size types * @throws IOException Error prevents the document from being fully parsed * @throws JDOMException Errors occur in parsing */ @@ -104,7 +103,7 @@ public class ImageTransform { * * @param bufImg Buffered image to scale * @param imgHeight Original image height - * @param imgwidth Original image width + * @param imgWidth Original image width * @param dimensionMap Image dimensions by size type * @param sizeType Size type to scale * @return New scaled buffered image Modified: ofbiz/branches/jackrabbit20100709/framework/common/template/JsLanguageFilesMapping.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/template/JsLanguageFilesMapping.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/template/JsLanguageFilesMapping.ftl (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/template/JsLanguageFilesMapping.ftl Sun May 29 11:02:09 2011 @@ -66,4 +66,24 @@ public final class JsLanguageFilesMappin } } + + public static class validation { + private static Map<String, String> localeFiles = FastMap.newInstance(); + private static String defaultValidation = "/images/webapp/images/jquery/plugins/validate/localization/messages_en.js"; + + static { + <#list validation.keySet() as validationFiles> + <#assign filePath = validation.get(validationFiles) /> + localeFiles.put("${validationFiles}", "${filePath}"); + </#list> + } + + public static String getFilePath(String locale) { + if (validation.localeFiles.get(locale) == null) { + return validation.defaultValidation; + } + return validation.localeFiles.get(locale); + } + + } } Modified: ofbiz/branches/jackrabbit20100709/framework/common/webcommon/WEB-INF/common-controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/webcommon/WEB-INF/common-controller.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/webcommon/WEB-INF/common-controller.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/webcommon/WEB-INF/common-controller.xml Sun May 29 11:02:09 2011 @@ -76,6 +76,13 @@ under the License. <response name="success" type="view" value="main"/> <response name="error" type="view" value="login"/> </request-map> + <request-map uri="ajaxCheckLogin" edit="false"> + <description>Verify a user is logged in.</description> + <security https="true" auth="false"/> + <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="checkLogin"/> + <response name="success" type="view" value="main"/> + <response name="error" type="view" value="ajaxLogin"/> + </request-map> <request-map uri="login"> <security https="true" auth="false"/> <event type="java" path="org.ofbiz.webapp.control.LoginWorker" invoke="login"/> @@ -198,6 +205,7 @@ under the License. <!-- Lookup requests --> <request-map uri="LookupGeo"><security https="true" auth="true"/><response name="success" type="view" value="LookupGeo"/></request-map> <request-map uri="LookupGeoName"><security https="true" auth="true"/><response name="success" type="view" value="LookupGeoName"/></request-map> + <request-map uri="LookupLocale"><security https="true" auth="true"/><response name="success" type="view" value="LookupLocale"/></request-map> <!--========================== AJAX events =====================--> <!-- Get states related to a country --> @@ -250,6 +258,7 @@ under the License. <view-map name="error" page="/error/error.jsp"/> <view-map name="main" type="none"/> <view-map name="login" type="screen" page="component://common/widget/CommonScreens.xml#login"/> + <view-map name="ajaxLogin" type="screen" page="component://common/widget/CommonScreens.xml#ajaxNotLoggedIn"/> <view-map name="requirePasswordChange" type="screen" page="component://common/widget/CommonScreens.xml#requirePasswordChange"/> <view-map name="forgotPassword" type="screen" page="component://common/widget/CommonScreens.xml#forgotPassword"/> <view-map name="EventMessages" type="screen" page="component://common/widget/CommonScreens.xml#EventMessages"/> @@ -268,5 +277,6 @@ under the License. <view-map name="viewBlocked" type="screen" page="component://common/widget/CommonScreens.xml#viewBlocked"/> <view-map name="LookupGeo" type="screen" page="component://common/widget/LookupScreens.xml#LookupGeo"/> - <view-map name="LookupGeoName" type="screen" page="component://common/widget/LookupScreens.xml#LookupGeoName"/> + <view-map name="LookupGeoName" type="screen" page="component://common/widget/LookupScreens.xml#LookupGeoName"/> + <view-map name="LookupLocale" type="screen" page="component://common/widget/LookupScreens.xml#LookupLocale"/> </site-conf> Modified: ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/flotCharts/Bars.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/flotCharts/Bars.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/flotCharts/Bars.ftl (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/flotCharts/Bars.ftl Sun May 29 11:02:09 2011 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> <script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/flot/excanvas.min.js</@ofbizContentUrl>"></script> -<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/jquery-1.5.2.min.js</@ofbizContentUrl>"></script> +<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/jquery-1.6.1.min.js</@ofbizContentUrl>"></script> <script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/flot/jquery.flot.js</@ofbizContentUrl>"></script> <div id="${chartId}Div" style="width:600px;height:300px;"></div> Modified: ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/flotCharts/Pie.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/flotCharts/Pie.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/flotCharts/Pie.ftl (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/flotCharts/Pie.ftl Sun May 29 11:02:09 2011 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> <script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/flot/excanvas.min.js</@ofbizContentUrl>"></script> -<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/jquery-1.5.2.min.js</@ofbizContentUrl>"></script> +<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/jquery-1.6.1.min.js</@ofbizContentUrl>"></script> <script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/flot/jquery.flot.js</@ofbizContentUrl>"></script> <script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/flot/jquery.flot.pie.js</@ofbizContentUrl>"></script> Modified: ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/htmlTemplate.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/htmlTemplate.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/htmlTemplate.ftl (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/htmlTemplate.ftl Sun May 29 11:02:09 2011 @@ -19,7 +19,7 @@ under the License. <#include "component://widget/templates/htmlFormMacroLibrary.ftl"/> -<#macro lookupField className="" alert="" name="" value="" size="20" maxlength="20" id="" event="" action="" disabled="" autocomplete="" descriptionFieldName="" formName="" fieldFormName="" targetParameterIter="" imgSrc="" ajaxUrl="" ajaxEnabled="" presentation="layer" width="" height="" position="topleft" fadeBackground="true" clearText="" showDescription="" initiallyCollapsed=""> +<#macro lookupField className="" alert="" name="" value="" size="20" maxlength="20" id="" event="" action="" readonly="" autocomplete="" descriptionFieldName="" formName="" fieldFormName="" targetParameterIter="" imgSrc="" ajaxUrl="" ajaxEnabled="" presentation="layer" width="" height="" position="topleft" fadeBackground="true" clearText="" showDescription="" initiallyCollapsed=""> <#if (!ajaxEnabled?has_content)> <#assign javascriptEnabled = Static["org.ofbiz.base.util.UtilHttp"].isJavaScriptEnabled(request) /> <#if (javascriptEnabled)> @@ -41,12 +41,12 @@ under the License. <#local showDescription = "false" /> </#if> </#if> - <#if "true" == disabled> - <#local disabled = true/> + <#if "true" == readonly> + <#local readonly = true/> <#else> - <#local disabled = false /> + <#local readonly = false /> </#if> - <@renderLookupField className alert name value size maxlength id event action disabled autocomplete descriptionFieldName formName fieldFormName targetParameterIter imgSrc ajaxUrl ajaxEnabled presentation width height position fadeBackground clearText showDescription initiallyCollapsed/> + <@renderLookupField className alert name value size maxlength id event action readonly autocomplete descriptionFieldName formName fieldFormName targetParameterIter imgSrc ajaxUrl ajaxEnabled presentation width height position fadeBackground clearText showDescription initiallyCollapsed/> </#macro> <#macro nextPrev commonUrl="" ajaxEnabled=false javaScriptEnabled=false paginateStyle="nav-pager" paginateFirstStyle="nav-first" viewIndex=0 highIndex=0 listSize=0 viewSize=1 ajaxFirstUrl="" firstUrl="" paginateFirstLabel="" paginatePreviousStyle="nav-previous" ajaxPreviousUrl="" previousUrl="" paginatePreviousLabel="" pageLabel="" ajaxSelectUrl="" selectUrl="" ajaxSelectSizeUrl="" selectSizeUrl="" commonDisplaying="" paginateNextStyle="nav-next" ajaxNextUrl="" nextUrl="" paginateNextLabel="" paginateLastStyle="nav-last" ajaxLastUrl="" lastUrl="" paginateLastLabel="" paginateViewSizeLabel="" > Modified: ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/lookup.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/lookup.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/lookup.ftl (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/lookup.ftl Sun May 29 11:02:09 2011 @@ -27,7 +27,7 @@ under the License. <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <title>${title?if_exists}</title> - <script language="javascript" src="<@ofbizContentUrl>/images/jquery/jquery-1.5.2.min.js</@ofbizContentUrl>" type="text/javascript"></script> + <script language="javascript" src="<@ofbizContentUrl>/images/jquery/jquery-1.6.1.min.js</@ofbizContentUrl>" type="text/javascript"></script> <script language="javascript" src="<@ofbizContentUrl>/images/selectall.js</@ofbizContentUrl>" type="text/javascript"></script> <#if layoutSettings.javaScripts?has_content> <#--layoutSettings.javaScripts is a list of java scripts. --> Modified: ofbiz/branches/jackrabbit20100709/framework/common/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/widget/CommonScreens.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/widget/CommonScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/widget/CommonScreens.xml Sun May 29 11:02:09 2011 @@ -107,21 +107,23 @@ under the License. <actions> <!-- The default (global) java scripts --> <!-- jQuery part --> + <!-- Load available JS Language Files --> + <set field="initialLocaleComplete" type="String" value="${groovy:parameters?.userLogin?.lastLocale}" default-value="${groovy:locale.toString()}"/> + <set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.datejs.getFilePath(initialLocaleComplete)}" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.jquery.getFilePath(initialLocaleComplete)}" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.validation.getFilePath(initialLocaleComplete)}" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.3.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/jquery.maskedinput-1.2.2.min.js" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.8.11.custom.min.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.8.13.custom.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/jeditable/jquery.jeditable.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/fjTimer/jquerytimer-min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/ui/jquery.ui.datepicker.js" global="true"/> - <!-- Load available JS Language Files --> - <set field="initialLocaleComplete" type="String" value="${groovy:parameters?.userLogin?.lastLocale}" default-value="${groovy:locale.toString()}"/> - <set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.datejs.getFilePath(initialLocaleComplete)}" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.jquery.getFilePath(initialLocaleComplete)}" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.5.2.min.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.6.1.min.js" global="true"/> <!-- jQuery CSSs --> <set field="layoutSettings.styleSheets[+0]" value="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.css" global="true"/> @@ -342,21 +344,23 @@ under the License. <set field="layoutSettings.rtlStyleSheets[+0]" value="/images/mainrtl.css" global="true"/> <!-- The default (global) java scripts --> <!-- jQuery part --> + <!-- Load available JS Language Files --> + <set field="initialLocaleComplete" type="String" value="${groovy:parameters?.userLogin?.lastLocale}" default-value="${groovy:locale.toString()}"/> + <set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.datejs.getFilePath(initialLocaleComplete)}" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.jquery.getFilePath(initialLocaleComplete)}" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.validation.getFilePath(initialLocaleComplete)}" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.3.min.js" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.8.11.custom.min.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.8.13.custom.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/jeditable/jquery.jeditable.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/fjTimer/jquerytimer-min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/ui/jquery.ui.datepicker.js" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.5.2.min.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.6.1.min.js" global="true"/> <!-- jQuery CSSs --> <set field="layoutSettings.styleSheets[+0]" value="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.css" global="true"/> - <!-- Load available JS Language Files --> - <set field="initialLocaleComplete" type="String" value="${groovy:parameters?.userLogin?.lastLocale}" default-value="${groovy:locale.toString()}"/> - <set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.datejs.getFilePath(initialLocaleComplete)}" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.jquery.getFilePath(initialLocaleComplete)}" global="true"/> <set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/> @@ -445,6 +449,18 @@ under the License. </section> </screen> + <screen name="ajaxNotLoggedIn"> + <section> + <widgets> + <decorator-screen name="LookupDecorator"> + <decorator-section name="body"> + <label>${uiLabelMap.CommonSessionTimeoutPleaseLogIn}</label> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> + <screen name="requirePasswordChange"> <section> <widgets> Propchange: ofbiz/branches/jackrabbit20100709/framework/common/widget/HelpScreens.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun May 29 11:02:09 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/framework/common/widget/HelpScreens.xml:951708-952957 /ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml:952958-1044489 /ofbiz/branches/multitenant20100310/framework/common/widget/HelpScreens.xml:921280-927264 -/ofbiz/trunk/framework/common/widget/HelpScreens.xml:962442-1096699 +/ofbiz/trunk/framework/common/widget/HelpScreens.xml:962442-1128853 Modified: ofbiz/branches/jackrabbit20100709/framework/common/widget/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/widget/LookupForms.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/widget/LookupForms.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/widget/LookupForms.xml Sun May 29 11:02:09 2011 @@ -59,14 +59,14 @@ under the License. <field name="abbreviation" title="${uiLabelMap.CommonGeoAbbr}"><display/></field> <field name="wellKnownText" title="${uiLabelMap.CommonGeoWellKnownText}"><display/></field> </form> - + <form name="LookupGeoName" extends="LookupGeo" target="LookupGeoName"/> <form name="listLookupGeoName" extends="listLookupGeo" paginate-target="LookupGeoName"> <field name="geoId" widget-style="buttontext" title="${uiLabelMap.CommonGeoId}"> <hyperlink also-hidden="false" target-type="plain" description="${geoId}" target="javascript:set_values('${geoName}', '${geoId}')"/> </field> - </form> - + </form> + <form name="LookupUserLogin" type="single" target="LookupUserLogin"> <field name="userLoginId" title="${uiLabelMap.CommonUserLoginId}"><text-find/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> @@ -97,7 +97,7 @@ under the License. <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field> </form> - + <form name="ListPortalPages" type="list" list-name="listIt" paginate-target="LookupPortalPage" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> @@ -114,4 +114,19 @@ under the License. <hyperlink also-hidden="false" target-type="plain" description="${portalPageId}" target="javascript:set_value('${portalPageId}')"/> </field> </form> + + <form name="LookupLocale" type="single" target="LookupLocale"> + <field name="localeString"><text-find/></field> + <field name="localeName" title="${uiLabelMap.CommonLanguageTitle}"><text-find/></field> + <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field> + </form> + + <form name="ListLocales" type="list" list-name="locales" paginate-target="LookupLocale" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + <field name="localeString" widget-style="buttontext"> + <hyperlink also-hidden="false" target-type="plain" description="${localeString}" target="javascript:set_value('${localeString}', '${localeName}')"/> + </field> + <field name="localeName" title="${uiLabelMap.CommonLanguageTitle}"><display/></field> + </form> </forms> Modified: ofbiz/branches/jackrabbit20100709/framework/common/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/widget/LookupScreens.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/widget/LookupScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/widget/LookupScreens.xml Sun May 29 11:02:09 2011 @@ -207,7 +207,7 @@ under the License. </widgets> </section> </screen> - + <screen name="LookupPortalPage"> <section> <actions> @@ -225,4 +225,28 @@ under the License. </widgets> </section> </screen> + + <screen name="LookupLocale"> + <section> + <actions> + <property-map resource="SecurityUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> + <set field="title" value="${uiLabelMap.CommonLookupLocale}"/> + <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> + <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="20"/> + <set field="inputFields" from-field="parameters"/> + <script location="component://common/webcommon/WEB-INF/actions/includes/GetLocaleList.groovy"/> + </actions> + <widgets> + <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> + <decorator-section name="search-options"> + <include-form name="LookupLocale" location="component://common/widget/LookupForms.xml"/> + </decorator-section> + <decorator-section name="search-results"> + <include-form name="ListLocales" location="component://common/widget/LookupForms.xml"/> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> </screens> Modified: ofbiz/branches/jackrabbit20100709/framework/datafile/src/org/ofbiz/datafile/DataFile2EntityXml.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/datafile/src/org/ofbiz/datafile/DataFile2EntityXml.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/datafile/src/org/ofbiz/datafile/DataFile2EntityXml.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/datafile/src/org/ofbiz/datafile/DataFile2EntityXml.java Sun May 29 11:02:09 2011 @@ -38,7 +38,9 @@ public class DataFile2EntityXml { } /** - * @param args the command line arguments + * Writes the entity xml + * @param fileName the file name + * @param dataFile the data file name */ public static void writeToEntityXml(String fileName, DataFile dataFile) throws DataFileException { File file = new File(fileName); Modified: ofbiz/branches/jackrabbit20100709/framework/datafile/src/org/ofbiz/datafile/Record.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/datafile/src/org/ofbiz/datafile/Record.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/datafile/src/org/ofbiz/datafile/Record.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/datafile/src/org/ofbiz/datafile/Record.java Sun May 29 11:02:09 2011 @@ -478,7 +478,7 @@ public class Record implements Serializa /** Creates new Record * @param modelRecord * @throws DataFileException Exception thown for various errors, generally has a nested exception - * @return + * @return return the Record Object created */ public static Record createRecord(ModelRecord modelRecord) throws DataFileException { Record record = new Record(modelRecord); @@ -490,7 +490,7 @@ public class Record implements Serializa * @param modelRecord * @param fields * @throws DataFileException Exception thown for various errors, generally has a nested exception - * @return + * @return return the Record Object created */ public static Record createRecord(ModelRecord modelRecord, Map<String, Object> fields) throws DataFileException { Record record = new Record(modelRecord, fields); @@ -503,7 +503,7 @@ public class Record implements Serializa * @param lineNum * @param modelRecord * @throws DataFileException Exception thown for various errors, generally has a nested exception - * @return + * @return return the Record Object created */ public static Record createRecord(String line, int lineNum, ModelRecord modelRecord) throws DataFileException { Record record = new Record(modelRecord); @@ -538,7 +538,7 @@ public class Record implements Serializa * @param modelRecord * @param delimiter * @throws DataFileException Exception thown for various errors, generally has a nested exception - * @return + * @return return a Record Object */ public static Record createDelimitedRecord(String line, int lineNum, ModelRecord modelRecord, char delimiter, String textDelimiter) throws DataFileException { Record record = new Record(modelRecord); Modified: ofbiz/branches/jackrabbit20100709/framework/datafile/src/org/ofbiz/datafile/RecordIterator.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/datafile/src/org/ofbiz/datafile/RecordIterator.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/datafile/src/org/ofbiz/datafile/RecordIterator.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/datafile/src/org/ofbiz/datafile/RecordIterator.java Sun May 29 11:02:09 2011 @@ -214,7 +214,7 @@ public class RecordIterator { * @param lineNum * @param modelDataFile * @throws DataFileException Exception thown for various errors, generally has a nested exception - * @return + * @return return the ModelRecord Object found */ protected static ModelRecord findModelForLine(String line, int lineNum, ModelDataFile modelDataFile) throws DataFileException { // if (Debug.infoOn()) Debug.logInfo("[DataFile.findModelForLine] line: " + line, module); Modified: ofbiz/branches/jackrabbit20100709/framework/entity/config/entityengine.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/entity/config/entityengine.xml?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/entity/config/entityengine.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/entity/config/entityengine.xml Sun May 29 11:02:09 2011 @@ -181,6 +181,7 @@ access. For a detailed description see t <read-data reader-name="seed-initial"/> <read-data reader-name="demo"/> <read-data reader-name="ext"/> + <!-- beware use-indices-unique="false" is needed because of Derby bug with null values in a unique index --> <inline-jdbc jdbc-driver="org.apache.derby.jdbc.EmbeddedDriver" jdbc-uri="jdbc:derby:ofbiz;create=true" @@ -202,6 +203,7 @@ access. For a detailed description see t use-indices-unique="false" alias-view-columns="false" use-order-by-nulls="true"> + <!-- beware use-indices-unique="false" is needed because of Derby bug with null values in a unique index --> <inline-jdbc jdbc-driver="org.apache.derby.jdbc.EmbeddedDriver" jdbc-uri="jdbc:derby:ofbizodbc;create=true" @@ -223,6 +225,7 @@ access. For a detailed description see t use-indices-unique="false" alias-view-columns="false" use-order-by-nulls="true"> + <!-- beware use-indices-unique="false" is needed because of Derby bug with null values in a unique index --> <read-data reader-name="seed"/> <read-data reader-name="seed-initial"/> <read-data reader-name="demo"/> @@ -252,6 +255,7 @@ access. For a detailed description see t <read-data reader-name="seed-initial"/> <read-data reader-name="demo"/> <read-data reader-name="ext"/> + <!-- beware use-indices-unique="false" is needed because of Derby bug with null values in a unique index --> <inline-jdbc jdbc-driver="org.apache.derby.jdbc.EmbeddedDriver" jdbc-uri="jdbc:derby:ofbiztenant;create=true" @@ -677,7 +681,7 @@ access. For a detailed description see t time-between-eviction-runs-millis="600000"/> <!-- Sample remote URI: jdbc-uri="jdbc:firebirdsql://localhost:3050//opt/interbase/data/ofbiz.gdb" --> <!-- <jndi-jdbc jndi-server-name="default" jndi-name="comp/env/jdbc/xa/localfirebird" isolation-level="ReadCommitted"/> --> <!-- Orion Style JNDI name --> - <!-- <tyrex-dataSource dataSource-name="firebird" isolation-level="ReadCommitted"/> Ã --> + <!-- <tyrex-dataSource dataSource-name="firebird" isolation-level="ReadCommitted"/> --> </datasource> <!-- The following has been tested with SQL Server 2005 + MS SQL Server JDBC Driver 1.1 Modified: ofbiz/branches/jackrabbit20100709/framework/entity/dtd/entitymodel.xsd URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/entity/dtd/entitymodel.xsd?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/entity/dtd/entitymodel.xsd (original) +++ ofbiz/branches/jackrabbit20100709/framework/entity/dtd/entitymodel.xsd Sun May 29 11:02:09 2011 @@ -134,7 +134,7 @@ under the License. This makes the field NOT NULL on the database (like primary key fields). It's possible to use an id-ne similiar field type. But rows can be added from outside of ofbiz (e.g. database manager, third party programm, etc). - This patch uses the ability of a database to set not null constraints. + This uses the ability of a database to set not null constraints. Defaults to false. </xs:documentation> </xs:annotation> Modified: ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/GenericDelegator.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/GenericDelegator.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/GenericDelegator.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/GenericDelegator.java Sun May 29 11:02:09 2011 @@ -861,7 +861,7 @@ public class GenericDelegator implements return value; } catch (GenericEntityException e) { - String errMsg = "Failure in create operation for entity [" + value.getEntityName() + "]: " + e.toString() + ". Rolling back transaction."; + String errMsg = "Failure in create operation for entity [" + (value != null ? value.getEntityName() : "null") + "]: " + e.toString() + ". Rolling back transaction."; Debug.logError(errMsg, module); try { // only rollback the transaction if we started one... @@ -995,7 +995,9 @@ public class GenericDelegator implements this.saveEntitySyncRemoveInfo(primaryKey); if (testMode) { - storeForTestRollback(new TestOperation(OperationType.DELETE, removedEntity)); + if (removedEntity != null) { + storeForTestRollback(new TestOperation(OperationType.DELETE, removedEntity)); + } } ecaRunner.evalRules(EntityEcaHandler.EV_RETURN, EntityEcaHandler.OP_REMOVE, primaryKey, false); @@ -1061,7 +1063,9 @@ public class GenericDelegator implements int num = helper.removeByPrimaryKey(value.getPrimaryKey()); if (testMode) { - storeForTestRollback(new TestOperation(OperationType.DELETE, removedValue)); + if (removedValue != null) { + storeForTestRollback(new TestOperation(OperationType.DELETE, removedValue)); + } } this.saveEntitySyncRemoveInfo(value.getPrimaryKey()); Modified: ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/jdbc/JdbcValueHandler.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/jdbc/JdbcValueHandler.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/jdbc/JdbcValueHandler.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/jdbc/JdbcValueHandler.java Sun May 29 11:02:09 2011 @@ -241,7 +241,7 @@ public abstract class JdbcValueHandler<T /** * Returns the SQL type for this handler. - * @return + * @return return the SQL type * @see <code>java.sql.Types</code> */ public int getSqlType() { @@ -252,9 +252,9 @@ public abstract class JdbcValueHandler<T * object is converted to the Java data type specified in the fieldtype * file. * - * @param rs - * @param columnIndex - * @return + * @param rs the ResultSet object + * @param columnIndex the column index + * @return get value from result set * @throws SQLException */ public abstract T getValue(ResultSet rs, int columnIndex) throws SQLException; @@ -262,8 +262,8 @@ public abstract class JdbcValueHandler<T /** * Returns a new instance of the object - initialized with * the specified SQL type. - * @param sqlType - * @return + * @param sqlType the sql type + * @return returns a new instance */ protected abstract JdbcValueHandler<T> newInstance(int sqlType); Modified: ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/jdbc/SQLProcessor.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/jdbc/SQLProcessor.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/jdbc/SQLProcessor.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/jdbc/SQLProcessor.java Sun May 29 11:02:09 2011 @@ -87,7 +87,7 @@ public class SQLProcessor { /** * Construct an object based on the helper/datasource * - * @param helperName The datasource helper (see entityengine.xml <datasource name="..">) + * @param helperInfo The datasource helper (see entityengine.xml <datasource name="..">) */ public SQLProcessor(GenericHelperInfo helperInfo) { this.helperInfo = helperInfo; @@ -98,7 +98,7 @@ public class SQLProcessor { * Construct an object with an connection given. The connection will not * be closed by this SQLProcessor, but may be by some other. * - * @param helperName The datasource helper (see entityengine.xml <datasource name="..">) + * @param helperInfo The datasource helper (see entityengine.xml <datasource name="..">) * @param connection The connection to be used */ public SQLProcessor(GenericHelperInfo helperInfo, Connection connection) { Modified: ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/serialize/XmlSerializer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/serialize/XmlSerializer.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/serialize/XmlSerializer.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/serialize/XmlSerializer.java Sun May 29 11:02:09 2011 @@ -81,9 +81,9 @@ public class XmlSerializer { * If the XML string contains a serialized <code>GenericValue</code> or <code>GenericPK</code> * then it is possible to unintentionally corrupt the database.</p> * - * @param content - * @param delegator - * @return + * @param content the content + * @param delegator the delegator + * @return return a deserialized object from XML string * @throws SerializeException * @throws SAXException * @throws ParserConfigurationException @@ -109,9 +109,9 @@ public class XmlSerializer { * contains a serialized <code>GenericValue</code> or <code>GenericPK</code> * then it is possible to unintentionally corrupt the database.</p> * - * @param document - * @param delegator - * @return + * @param document the document + * @param delegator the delegator + * @return returns a deserialized object from a DOM document * @throws SerializeException */ public static Object deserialize(Document document, Delegator delegator) throws SerializeException { Modified: ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java Sun May 29 11:02:09 2011 @@ -96,9 +96,10 @@ public class EntityDataLoader { } else { throw new IllegalArgumentException("Reader name list does not contain String(s) or Element(s)"); } + readerName = readerName.trim(); // get all of the main resource model stuff, ie specified in the entityengine.xml file - EntityDataReaderInfo entityDataReaderInfo = EntityConfigUtil.getEntityDataReaderInfo(readerName.trim()); + EntityDataReaderInfo entityDataReaderInfo = EntityConfigUtil.getEntityDataReaderInfo(readerName); if (entityDataReaderInfo == null) { Debug.logInfo("Could not find entity-data-reader named: " + readerName + ". Creating a new reader with this name. ", module); Modified: ofbiz/branches/jackrabbit20100709/framework/entityext/src/org/ofbiz/entityext/EntityWatchServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/entityext/src/org/ofbiz/entityext/EntityWatchServices.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/entityext/src/org/ofbiz/entityext/EntityWatchServices.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/entityext/src/org/ofbiz/entityext/EntityWatchServices.java Sun May 29 11:02:09 2011 @@ -34,9 +34,9 @@ public class EntityWatchServices { /** * This service is meant to be called through an Entity ECA (EECA) to watch an entity * - * @param dctx - * @param context - * @return + * @param dctx the dispatch context + * @param context the context + * @return the result of the service execution */ public static Map<String, Object> watchEntity(DispatchContext dctx, Map<String, ? extends Object> context) { GenericValue newValue = (GenericValue) context.get("newValue"); Modified: ofbiz/branches/jackrabbit20100709/framework/entityext/src/org/ofbiz/entityext/cache/EntityCacheServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/entityext/src/org/ofbiz/entityext/cache/EntityCacheServices.java?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/entityext/src/org/ofbiz/entityext/cache/EntityCacheServices.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/entityext/src/org/ofbiz/entityext/cache/EntityCacheServices.java Sun May 29 11:02:09 2011 @@ -165,9 +165,9 @@ public class EntityCacheServices impleme /** * Clear All Entity Caches Service - *@param ctx The DispatchContext that this service is operating in - *@param context Map containing the input parameters - *@return Map with the result of the service, the output parameters + * @param dctx The DispatchContext that this service is operating in + * @param context Map containing the input parameters + * @return Map with the result of the service, the output parameters */ public static Map<String, Object> clearAllEntityCaches(DispatchContext dctx, Map<String, ? extends Object> context) { Delegator delegator = dctx.getDelegator(); @@ -182,9 +182,9 @@ public class EntityCacheServices impleme /** * Clear Cache Line Service: one of the following context parameters is required: value, dummyPK or primaryKey - *@param ctx The DispatchContext that this service is operating in - *@param context Map containing the input parameters - *@return Map with the result of the service, the output parameters + * @param dctx The DispatchContext that this service is operating in + * @param context Map containing the input parameters + * @return Map with the result of the service, the output parameters */ public static Map<String, Object> clearCacheLine(DispatchContext dctx, Map<String, ? extends Object> context) { Delegator delegator = dctx.getDelegator(); Modified: ofbiz/branches/jackrabbit20100709/framework/example/webapp/example/flot/flotPie.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/example/webapp/example/flot/flotPie.ftl?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/example/webapp/example/flot/flotPie.ftl (original) +++ ofbiz/branches/jackrabbit20100709/framework/example/webapp/example/flot/flotPie.ftl Sun May 29 11:02:09 2011 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> <script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/flot/excanvas.min.js</@ofbizContentUrl>"></script> -<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/jquery-1.5.2.min.js</@ofbizContentUrl>"></script> +<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/jquery-1.6.1.min.js</@ofbizContentUrl>"></script> <script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/flot/jquery.flot.js</@ofbizContentUrl>"></script> <script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/flot/jquery.flot.pie.js</@ofbizContentUrl>"></script> Modified: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/fieldlookup.js URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/fieldlookup.js?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/fieldlookup.js (original) +++ ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/fieldlookup.js Sun May 29 11:02:09 2011 @@ -180,7 +180,7 @@ function initiallyCollapseDelayed() { /************************************* * Fieldlookup Class & Methods *************************************/ -function ConstructLookup(requestUrl, inputFieldId, dialogTarget, dialogOptionalTarget, formName, width, height, position, modal, ajaxUrl, showDescription, presentation, defaultMinLength, args) { +function ConstructLookup(requestUrl, inputFieldId, dialogTarget, dialogOptionalTarget, formName, width, height, position, modal, ajaxUrl, showDescription, presentation, defaultMinLength, defaultDelay, args) { // add the presentation attribute to the request url to let the request know which decorator should be loaded if(!presentation) { @@ -213,7 +213,7 @@ function ConstructLookup(requestUrl, inp SHOW_DESCRIPTION = showDescription; //write the new input box id in the ajaxUrl Array ajaxUrl = ajaxUrl.replace(ajaxUrl.substring(0, ajaxUrl.indexOf(",")), newInputBoxId); - new ajaxAutoCompleter(ajaxUrl, showDescription, defaultMinLength, formName); + new ajaxAutoCompleter(ajaxUrl, showDescription, defaultMinLength, defaultDelay, formName); } var positioning = null; @@ -540,7 +540,7 @@ function modifySubmitButton (lookupDiv) var link = cellElement.href; var liSub = link.substring(link.lastIndexOf('/')+1,(link.length)); if (liSub.indexOf("javascript:set_") != -1) { - cellElement.href = liSub; + cellElement.href = link; } else { cellElement.href = "javascript:lookupAjaxRequest('" + liSub + "&presentation=layer')"; } @@ -567,7 +567,7 @@ function modifySubmitButton (lookupDiv) var link = cellChild[child].href; var liSub = link.substring(link.lastIndexOf('/')+1,(link.length)); if (liSub.indexOf("javascript:set_") != -1) { - cellChild[child].href = liSub; + cellChild[child].href = link; } else { cellChild[child].href = "javascript:lookupAjaxRequest('" + liSub + "&presentation=layer')"; } @@ -588,10 +588,6 @@ function lookupAjaxRequest(request) { request = request.substring(0, request.indexOf('?')); lookupId = GLOBAL_LOOKUP_REF.getReference(ACTIVATED_LOOKUP).lookupId; jQuery("#" + lookupId).load(request, arg, function(data) { - if (data.search(/loginform/) != -1) { - window.location.href = window.location.href; - return; - } modifySubmitButton(lookupId); }); } @@ -607,10 +603,6 @@ function lookupFormAjaxRequest(formActio var data = jQuery("#" + form).serialize(); data = data + "&presentation=" + GLOBAL_LOOKUP_REF.getReference(ACTIVATED_LOOKUP).presentation; jQuery("#" + lookupId).load(formAction, data, function(data) { - if (data.search(/loginform/) != -1) { - window.location.href = window.location.href; - return; - } modifySubmitButton(lookupId); }); } @@ -621,10 +613,6 @@ function lookupPaginationAjaxRequest(nav lookupId = GLOBAL_LOOKUP_REF.getReference(ACTIVATED_LOOKUP).lookupId; jQuery("#" + lookupId).load(navAction, function(data) { - if (data.search(/loginform/) != -1) { - window.location.href = window.location.href; - return; - } modifySubmitButton(lookupId); }); } Modified: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.accordion.css URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.accordion.css?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.accordion.css (original) +++ ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.accordion.css Sun May 29 11:02:09 2011 @@ -1,5 +1,5 @@ /* - * jQuery UI Accordion 1.8.11 + * jQuery UI Accordion 1.8.13 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. Modified: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.all.css URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.all.css?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.all.css (original) +++ ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.all.css Sun May 29 11:02:09 2011 @@ -1,5 +1,5 @@ /* - * jQuery UI CSS Framework 1.8.11 + * jQuery UI CSS Framework 1.8.13 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. Modified: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.autocomplete.css URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.autocomplete.css?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.autocomplete.css (original) +++ ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.autocomplete.css Sun May 29 11:02:09 2011 @@ -1,5 +1,5 @@ /* - * jQuery UI Autocomplete 1.8.11 + * jQuery UI Autocomplete 1.8.13 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. @@ -13,7 +13,7 @@ * html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */ /* - * jQuery UI Menu 1.8.11 + * jQuery UI Menu 1.8.13 * * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. Modified: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.button.css URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.button.css?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.button.css (original) +++ ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.button.css Sun May 29 11:02:09 2011 @@ -1,5 +1,5 @@ /* - * jQuery UI Button 1.8.11 + * jQuery UI Button 1.8.13 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. Modified: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.core.css URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.core.css?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.core.css (original) +++ ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.core.css Sun May 29 11:02:09 2011 @@ -1,5 +1,5 @@ /* - * jQuery UI CSS Framework 1.8.11 + * jQuery UI CSS Framework 1.8.13 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. Modified: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.datepicker.css URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.datepicker.css?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.datepicker.css (original) +++ ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.datepicker.css Sun May 29 11:02:09 2011 @@ -1,5 +1,5 @@ /* - * jQuery UI Datepicker 1.8.11 + * jQuery UI Datepicker 1.8.13 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. Modified: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.dialog.css URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.dialog.css?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.dialog.css (original) +++ ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.dialog.css Sun May 29 11:02:09 2011 @@ -1,5 +1,5 @@ /* - * jQuery UI Dialog 1.8.11 + * jQuery UI Dialog 1.8.13 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. Modified: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.progressbar.css URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.progressbar.css?rev=1128865&r1=1128864&r2=1128865&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.progressbar.css (original) +++ ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/jquery/ui/development-bundle/themes/base/jquery.ui.progressbar.css Sun May 29 11:02:09 2011 @@ -1,5 +1,5 @@ /* - * jQuery UI Progressbar 1.8.11 + * jQuery UI Progressbar 1.8.13 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) * Dual licensed under the MIT or GPL Version 2 licenses. |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |