You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2014/11/24 11:06:29 UTC
svn commit: r1641348 [7/7] - in
/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23: ./
applications/content/src/org/ofbiz/content/content/
applications/order/src/org/ofbiz/order/
applications/order/src/org/ofbiz/order/order/ applications/order/s...
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/FieldInfo.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/FieldInfo.java?rev=1641348&r1=1641347&r2=1641348&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/FieldInfo.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/FieldInfo.java Mon Nov 24 10:06:26 2014
@@ -116,6 +116,11 @@ public abstract class FieldInfo {
public abstract void accept(ModelFieldVisitor visitor);
+ /**
+ * Returns a new instance of this object.
+ *
+ * @param modelFormField
+ */
public abstract FieldInfo copy(ModelFormField modelFormField);
public int getFieldSource() {
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java?rev=1641348&r1=1641347&r2=1641348&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java Mon Nov 24 10:06:26 2014
@@ -1362,6 +1362,13 @@ public class ModelFormField {
super(fieldSource, fieldType, modelFormField);
}
+ // Copy constructor.
+ protected FieldInfoWithOptions(FieldInfoWithOptions original, ModelFormField modelFormField) {
+ super(original.getFieldSource(), original.getFieldType(), modelFormField);
+ this.noCurrentSelectedKey = original.noCurrentSelectedKey;
+ this.optionSources.addAll(original.optionSources);
+ }
+
public FieldInfoWithOptions(Element element, ModelFormField modelFormField) {
super(element, modelFormField);
@@ -3301,7 +3308,7 @@ public class ModelFormField {
}
private DropDownField(DropDownField original, ModelFormField modelFormField) {
- super(original.getFieldSource(), original.getFieldType(), modelFormField);
+ super(original, modelFormField);
this.current = original.current;
this.size = original.size;
this.textSize = original.textSize;
@@ -3430,7 +3437,7 @@ public class ModelFormField {
}
private RadioField(RadioField original, ModelFormField modelFormField) {
- super(original.getFieldSource(), original.getFieldType(), modelFormField);
+ super(original, modelFormField);
}
@Override
@@ -3468,7 +3475,7 @@ public class ModelFormField {
}
private CheckField(CheckField original, ModelFormField modelFormField) {
- super(original.getFieldSource(), original.getFieldType(), modelFormField);
+ super(original, modelFormField);
}
@Override
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/htmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=1641348&r1=1641347&r2=1641348&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/htmlFormMacroLibrary.ftl Mon Nov 24 10:06:26 2014
@@ -123,15 +123,16 @@ under the License.
<script type="text/javascript">
<#-- If language specific lib is found, use date / time converter else just copy the value fields -->
if (Date.CultureInfo != undefined) {
- var initDate = <#if value?has_content>jQuery("#${id}_i18n").val()<#else>""</#if>;
+ var initDate = <#if value?has_content>jQuery("#${id}").val()<#else>""</#if>;
if (initDate != "") {
var dateFormat = Date.CultureInfo.formatPatterns.shortDate<#if shortDateInput?? && !shortDateInput> + " " + Date.CultureInfo.formatPatterns.longTime</#if>;
- <#-- bad hack because the JS date parser doesn't understand dots in the date / time string -->
+ <#-- The JS date parser doesn't understand the dot before ms in the date/time string. The ms here should be always 000 -->
if (initDate.indexOf('.') != -1) {
initDate = initDate.substring(0, initDate.indexOf('.'));
}
+ jQuery("#${id}").val(initDate);
var ofbizTime = "<#if shortDateInput?? && shortDateInput>yyyy-MM-dd<#else>yyyy-MM-dd HH:mm:ss</#if>";
- var dateObj = Date.parse(initDate, ofbizTime);
+ var dateObj = Date.parseExact(initDate, ofbizTime);
var formatedObj = dateObj.toString(dateFormat);
jQuery("#${id}_i18n").val(formatedObj);
}
@@ -140,7 +141,7 @@ under the License.
var ofbizTime = "<#if shortDateInput?? && shortDateInput>yyyy-MM-dd<#else>yyyy-MM-dd HH:mm:ss</#if>";
var newValue = ""
if (this.value != "") {
- var dateObj = Date.parse(this.value, ofbizTime);
+ var dateObj = Date.parseExact(this.value, ofbizTime);
var dateFormat = Date.CultureInfo.formatPatterns.shortDate<#if shortDateInput?? && !shortDateInput> + " " + Date.CultureInfo.formatPatterns.longTime</#if>;
newValue = dateObj.toString(dateFormat);
}
@@ -149,7 +150,7 @@ under the License.
jQuery("#${id}_i18n").change(function() {
var dateFormat = Date.CultureInfo.formatPatterns.shortDate<#if shortDateInput?? && !shortDateInput> + " " + Date.CultureInfo.formatPatterns.longTime</#if>,
newValue = "",
- dateObj = Date.parse(this.value, dateFormat),
+ dateObj = Date.parseExact(this.value, dateFormat),
ofbizTime;
if (this.value != "" && dateObj !== null) {
ofbizTime = "<#if shortDateInput?? && shortDateInput>yyyy-MM-dd<#else>yyyy-MM-dd HH:mm:ss</#if>";
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/LICENSE?rev=1641348&r1=1641347&r2=1641348&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/LICENSE (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/LICENSE Mon Nov 24 10:06:26 2014
@@ -12,6 +12,7 @@ For additional details, see the NOTICE f
The following libraries are licensed under the Apache License Version 2.0:
specialpurpose/birt/lib/axis-ant-1.4.jar
specialpurpose/birt/lib/axis-1.4.jar
+specialpurpose/birt/lib/commons-discovery-0.5.jar
specialpurpose/cmssite/template/docbook/extensions/tagsoup-1.2.1.jar
specialpurpose/cmssite/template/docbook/extensions/xalan27.jar
specialpurpose/cmssite/template/docbook/extensions/webhelpindexer.jar
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/appserver/templates/glassfish21/README
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/appserver/templates/glassfish21/README?rev=1641348&r1=1641347&r2=1641348&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/appserver/templates/glassfish21/README (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/appserver/templates/glassfish21/README Mon Nov 24 10:06:26 2014
@@ -67,7 +67,7 @@ if (you are using JavaDB && want seed an
Refer [4]. If you want to use JavaDB with default settings, you can use entityengine.xml_patch
readily available under 'OFBIZ_HOME/setup/glassfish21'.
4. Load seed and demo data (optional, but highly recommended) by using
- './ant run-install' command under OFBIZ_HOME. Refer [5].
+ './ant load-demo' command under OFBIZ_HOME. Refer [5].
5. Copy OFBIZ_HOME/setup/glassfish21/deploy.sh to <work-folder>.
6. Run deploy.sh.
(without quotes) './deploy.sh <glassfish-home> <glassfish-domain-path>'.
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/appserver/templates/glassfish21/run.sh
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/appserver/templates/glassfish21/run.sh?rev=1641348&r1=1641347&r2=1641348&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/appserver/templates/glassfish21/run.sh (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/appserver/templates/glassfish21/run.sh Mon Nov 24 10:06:26 2014
@@ -54,7 +54,7 @@ echo "Started JavaDB server"
# Load the seed and demo data.
cd ${ofbizHome}
- ./ant run-install
+ ./ant load-demo
echo "Loaded seed and demo data"
# Restore entityengine.xml