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/17 10:11:35 UTC
svn commit: r1640111 [4/4] - in
/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23: ./
applications/accounting/script/org/ofbiz/accounting/admin/
applications/content/src/org/ofbiz/content/
applications/content/src/org/ofbiz/content/content/ app...
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java?rev=1640111&r1=1640110&r2=1640111&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java Mon Nov 17 09:11:33 2014
@@ -57,6 +57,7 @@ import org.ofbiz.widget.form.ModelFormFi
import org.ofbiz.widget.form.ModelFormField.DisplayEntityField;
import org.ofbiz.widget.form.ModelFormField.DisplayField;
import org.ofbiz.widget.form.ModelFormField.DropDownField;
+import org.ofbiz.widget.form.ModelFormField.FieldInfoWithOptions;
import org.ofbiz.widget.form.ModelFormField.FileField;
import org.ofbiz.widget.form.ModelFormField.HiddenField;
import org.ofbiz.widget.form.ModelFormField.HyperlinkField;
@@ -596,7 +597,7 @@ public class HtmlFormRenderer extends Ht
explicitDescription = dropDownField.getCurrentDescription(context);
}
if (UtilValidate.isEmpty(explicitDescription)) {
- explicitDescription = ModelFormField.FieldInfoWithOptions.getDescriptionForOptionKey(currentValue, allOptionValues);
+ explicitDescription = FieldInfoWithOptions.getDescriptionForOptionKey(currentValue, allOptionValues);
}
explicitDescription = encode(explicitDescription, modelFormField, context);
writer.append(explicitDescription);
@@ -691,7 +692,7 @@ public class HtmlFormRenderer extends Ht
if (UtilValidate.isNotEmpty(explicitDescription)) {
writer.append(encode(explicitDescription, modelFormField, context));
} else {
- String description = ModelFormField.FieldInfoWithOptions.getDescriptionForOptionKey(currentValue, allOptionValues);
+ String description = FieldInfoWithOptions.getDescriptionForOptionKey(currentValue, allOptionValues);
writer.append(encode(description, modelFormField, context));
}
writer.append("</option>");
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java?rev=1640111&r1=1640110&r2=1640111&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java Mon Nov 17 09:11:33 2014
@@ -599,7 +599,7 @@ public class ModelMenu extends ModelWidg
}
@Override
- public void accept(ModelWidgetVisitor visitor) {
+ public void accept(ModelWidgetVisitor visitor) throws Exception {
visitor.visit(this);
}
}
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java?rev=1640111&r1=1640110&r2=1640111&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java Mon Nov 17 09:11:33 2014
@@ -310,6 +310,7 @@ public class ModelMenuItem extends Model
localItem.link.setTarget("showPortalPage");
}
localItem.link.setText((String)portalPage.get("portalPageName", locale));
+ localItem.modelMenu = this.getModelMenu();
menuStringRenderer.renderMenuItem(writer, context, localItem);
}
}
@@ -922,7 +923,7 @@ public class ModelMenuItem extends Model
}
@Override
- public void accept(ModelWidgetVisitor visitor) {
+ public void accept(ModelWidgetVisitor visitor) throws Exception {
visitor.visit(this);
}
}
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java?rev=1640111&r1=1640110&r2=1640111&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java Mon Nov 17 09:11:33 2014
@@ -203,7 +203,7 @@ public class HtmlWidget extends ModelScr
}
@Override
- public void accept(ModelWidgetVisitor visitor) {
+ public void accept(ModelWidgetVisitor visitor) throws Exception {
visitor.visit(this);
}
}
@@ -248,7 +248,7 @@ public class HtmlWidget extends ModelScr
}
@Override
- public void accept(ModelWidgetVisitor visitor) {
+ public void accept(ModelWidgetVisitor visitor) throws Exception {
visitor.visit(this);
}
}
@@ -272,13 +272,13 @@ public class HtmlWidget extends ModelScr
}
@Override
- public void accept(ModelWidgetVisitor visitor) {
+ public void accept(ModelWidgetVisitor visitor) throws Exception {
visitor.visit(this);
}
}
@Override
- public void accept(ModelWidgetVisitor visitor) {
+ public void accept(ModelWidgetVisitor visitor) throws Exception {
visitor.visit(this);
}
}
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java?rev=1640111&r1=1640110&r2=1640111&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java Mon Nov 17 09:11:33 2014
@@ -358,7 +358,7 @@ public class IterateSectionWidget extend
}
@Override
- public void accept(ModelWidgetVisitor visitor) {
+ public void accept(ModelWidgetVisitor visitor) throws Exception {
visitor.visit(this);
}
}
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java?rev=1640111&r1=1640110&r2=1640111&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/ModelScreen.java Mon Nov 17 09:11:33 2014
@@ -67,7 +67,7 @@ public class ModelScreen extends ModelWi
}
@Override
- public void accept(ModelWidgetVisitor visitor) {
+ public void accept(ModelWidgetVisitor visitor) throws Exception {
visitor.visit(this);
}
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java?rev=1640111&r1=1640110&r2=1640111&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java Mon Nov 17 09:11:33 2014
@@ -243,7 +243,7 @@ public abstract class ModelScreenWidget
}
@Override
- public void accept(ModelWidgetVisitor visitor) {
+ public void accept(ModelWidgetVisitor visitor) throws Exception {
visitor.visit(this);
}
@@ -338,7 +338,7 @@ public abstract class ModelScreenWidget
}
@Override
- public void accept(ModelWidgetVisitor visitor) {
+ public void accept(ModelWidgetVisitor visitor) throws Exception {
visitor.visit(this);
}
@@ -451,7 +451,7 @@ public abstract class ModelScreenWidget
}
@Override
- public void accept(ModelWidgetVisitor visitor) {
+ public void accept(ModelWidgetVisitor visitor) throws Exception {
visitor.visit(this);
}
}
@@ -613,7 +613,7 @@ public abstract class ModelScreenWidget
}
@Override
- public void accept(ModelWidgetVisitor visitor) {
+ public void accept(ModelWidgetVisitor visitor) throws Exception {
visitor.visit(this);
}
}
@@ -643,7 +643,7 @@ public abstract class ModelScreenWidget
}
@Override
- public void accept(ModelWidgetVisitor visitor) {
+ public void accept(ModelWidgetVisitor visitor) throws Exception {
visitor.visit(this);
}
}
@@ -714,7 +714,7 @@ public abstract class ModelScreenWidget
}
@Override
- public void accept(ModelWidgetVisitor visitor) {
+ public void accept(ModelWidgetVisitor visitor) throws Exception {
visitor.visit(this);
}
}
@@ -778,7 +778,7 @@ public abstract class ModelScreenWidget
}
@Override
- public void accept(ModelWidgetVisitor visitor) {
+ public void accept(ModelWidgetVisitor visitor) throws Exception {
visitor.visit(this);
}
}
@@ -805,7 +805,7 @@ public abstract class ModelScreenWidget
}
@Override
- public void accept(ModelWidgetVisitor visitor) {
+ public void accept(ModelWidgetVisitor visitor) throws Exception {
visitor.visit(this);
}
}
@@ -840,7 +840,7 @@ public abstract class ModelScreenWidget
}
@Override
- public void accept(ModelWidgetVisitor visitor) {
+ public void accept(ModelWidgetVisitor visitor) throws Exception {
visitor.visit(this);
}
}
@@ -895,7 +895,7 @@ public abstract class ModelScreenWidget
}
@Override
- public void accept(ModelWidgetVisitor visitor) {
+ public void accept(ModelWidgetVisitor visitor) throws Exception {
visitor.visit(this);
}
}
@@ -976,7 +976,7 @@ public abstract class ModelScreenWidget
}
@Override
- public void accept(ModelWidgetVisitor visitor) {
+ public void accept(ModelWidgetVisitor visitor) throws Exception {
visitor.visit(this);
}
}
@@ -1058,7 +1058,7 @@ public abstract class ModelScreenWidget
}
@Override
- public void accept(ModelWidgetVisitor visitor) {
+ public void accept(ModelWidgetVisitor visitor) throws Exception {
visitor.visit(this);
}
}
@@ -1102,7 +1102,7 @@ public abstract class ModelScreenWidget
}
@Override
- public void accept(ModelWidgetVisitor visitor) {
+ public void accept(ModelWidgetVisitor visitor) throws Exception {
visitor.visit(this);
}
}
@@ -1249,7 +1249,7 @@ public abstract class ModelScreenWidget
}
@Override
- public void accept(ModelWidgetVisitor visitor) {
+ public void accept(ModelWidgetVisitor visitor) throws Exception {
visitor.visit(this);
}
}
@@ -1315,7 +1315,7 @@ public abstract class ModelScreenWidget
}
@Override
- public void accept(ModelWidgetVisitor visitor) {
+ public void accept(ModelWidgetVisitor visitor) throws Exception {
// TODO Auto-generated method stub
}
@@ -1367,7 +1367,7 @@ public abstract class ModelScreenWidget
}
@Override
- public void accept(ModelWidgetVisitor visitor) {
+ public void accept(ModelWidgetVisitor visitor) throws Exception {
visitor.visit(this);
}
}
@@ -1545,7 +1545,7 @@ public abstract class ModelScreenWidget
}
@Override
- public void accept(ModelWidgetVisitor visitor) {
+ public void accept(ModelWidgetVisitor visitor) throws Exception {
visitor.visit(this);
}
}
@@ -1626,7 +1626,7 @@ public abstract class ModelScreenWidget
}
@Override
- public void accept(ModelWidgetVisitor visitor) {
+ public void accept(ModelWidgetVisitor visitor) throws Exception {
visitor.visit(this);
}
}
@@ -1796,7 +1796,7 @@ public abstract class ModelScreenWidget
}
@Override
- public void accept(ModelWidgetVisitor visitor) {
+ public void accept(ModelWidgetVisitor visitor) throws Exception {
visitor.visit(this);
}
}
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/text/TextFormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/text/TextFormRenderer.java?rev=1640111&r1=1640110&r2=1640111&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/text/TextFormRenderer.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/text/TextFormRenderer.java Mon Nov 17 09:11:33 2014
@@ -36,6 +36,7 @@ import org.ofbiz.widget.form.ModelFormFi
import org.ofbiz.widget.form.ModelFormField.DateTimeField;
import org.ofbiz.widget.form.ModelFormField.DisplayField;
import org.ofbiz.widget.form.ModelFormField.DropDownField;
+import org.ofbiz.widget.form.ModelFormField.FieldInfoWithOptions;
import org.ofbiz.widget.form.ModelFormField.FileField;
import org.ofbiz.widget.form.ModelFormField.HiddenField;
import org.ofbiz.widget.form.ModelFormField.HyperlinkField;
@@ -116,7 +117,7 @@ public class TextFormRenderer implements
if (UtilValidate.isNotEmpty(explicitDescription)) {
this.makeTextString(writer, modelFormField.getWidgetStyle(), explicitDescription);
} else {
- this.makeTextString(writer, modelFormField.getWidgetStyle(), ModelFormField.FieldInfoWithOptions.getDescriptionForOptionKey(currentValue, allOptionValues));
+ this.makeTextString(writer, modelFormField.getWidgetStyle(), FieldInfoWithOptions.getDescriptionForOptionKey(currentValue, allOptionValues));
}
} else {
for (ModelFormField.OptionValue optionValue: allOptionValues) {
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java?rev=1640111&r1=1640110&r2=1640111&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/tree/ModelTree.java Mon Nov 17 09:11:33 2014
@@ -747,7 +747,7 @@ public class ModelTree extends ModelWidg
}
@Override
- public void accept(ModelWidgetVisitor visitor) {
+ public void accept(ModelWidgetVisitor visitor) throws Exception {
visitor.visit(this);
}
}
@@ -1110,13 +1110,13 @@ public class ModelTree extends ModelWidg
}
@Override
- public void accept(ModelWidgetVisitor visitor) {
+ public void accept(ModelWidgetVisitor visitor) throws Exception {
visitor.visit(this);
}
}
@Override
- public void accept(ModelWidgetVisitor visitor) {
+ public void accept(ModelWidgetVisitor visitor) throws Exception {
visitor.visit(this);
}
}
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/xml/XmlFormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/xml/XmlFormRenderer.java?rev=1640111&r1=1640110&r2=1640111&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/xml/XmlFormRenderer.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/xml/XmlFormRenderer.java Mon Nov 17 09:11:33 2014
@@ -36,6 +36,7 @@ import org.ofbiz.widget.form.ModelFormFi
import org.ofbiz.widget.form.ModelFormField.DateTimeField;
import org.ofbiz.widget.form.ModelFormField.DisplayField;
import org.ofbiz.widget.form.ModelFormField.DropDownField;
+import org.ofbiz.widget.form.ModelFormField.FieldInfoWithOptions;
import org.ofbiz.widget.form.ModelFormField.FileField;
import org.ofbiz.widget.form.ModelFormField.HiddenField;
import org.ofbiz.widget.form.ModelFormField.HyperlinkField;
@@ -121,7 +122,7 @@ public class XmlFormRenderer implements
if (UtilValidate.isNotEmpty(explicitDescription)) {
this.makeTextString(writer, modelFormField.getWidgetStyle(), explicitDescription);
} else {
- this.makeTextString(writer, modelFormField.getWidgetStyle(), ModelFormField.FieldInfoWithOptions.getDescriptionForOptionKey(currentValue, allOptionValues));
+ this.makeTextString(writer, modelFormField.getWidgetStyle(), FieldInfoWithOptions.getDescriptionForOptionKey(currentValue, allOptionValues));
}
} else {
for (ModelFormField.OptionValue optionValue : allOptionValues) {
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign?rev=1640111&r1=1640110&r2=1640111&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/webapp/ordermgr/reports/Last3MonthsSalesReport.rptdesign Mon Nov 17 09:11:33 2014
@@ -265,7 +265,6 @@ try {
}
month = month - 1
}
- Debug.log("================ Last 3 Months Sale Order Report====="+months);
cond = FastList.newInstance();
cond.add(EntityCondition.makeCondition("orderDateMonthOfYear", EntityOperator.IN, months));
cond.add(EntityCondition.makeCondition("orderDateYearName", EntityOperator.EQUALS, UtilMisc.toLongObject(thisYear)));
@@ -833,4 +832,4 @@ return true;]]></method>
</list-property>
</extended-item>
</body>
-</report>
\ No newline at end of file
+</report>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebaystore/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebaystore/entitydef/entitymodel.xml?rev=1640111&r1=1640110&r2=1640111&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebaystore/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ebaystore/entitydef/entitymodel.xml Mon Nov 17 09:11:33 2014
@@ -83,7 +83,7 @@ under the License.
<field name="itemId" type="id-long"/>
<field name="productStoreId" type="id-ne"/>
<field name="productId" type="id-ne"/>
- <field name="userLoginId" type="id-long"/>
+ <field name="userLoginId" type="id-vlong"/>
<field name="statusId" type="id-ne"/>
<field name="listingXml" type="very-long"/>
<field name="startDateTime" type="date-time"/>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=1640111&r1=1640110&r2=1640111&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Mon Nov 17 09:11:33 2014
@@ -81,7 +81,7 @@ under the License.
<description>Verify a user is logged in.</description>
<security https="true" auth="false"/>
<event type="java" path="org.ofbiz.securityext.login.LoginEvents" invoke="storeCheckLogin"/>
- <response name="success" type="view" value="main"/>
+ <response name="success" type="view-last" value="main"/>
<response name="error" type="view" value="login"/>
</request-map>
<request-map uri="login">
@@ -857,7 +857,7 @@ under the License.
</request-map>
<request-map uri="category">
<security https="false" auth="false"/>
- <response name="success" type="view" value="category"/>
+ <response name="success" type="view" value="category" save-current-view="true"/>
</request-map>
<request-map uri="product">
<security https="false" auth="false"/>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl?rev=1640111&r1=1640110&r2=1640111&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl Mon Nov 17 09:11:33 2014
@@ -94,8 +94,10 @@ under the License.
buttons: {
'${uiLabelMap.CommonSubmit}': function() {
var createAddressForm = jQuery("#displayCreateAddressForm");
- jQuery("<p>${uiLabelMap.CommonUpdatingData}</p>").insertBefore(createAddressForm);
- createPartyPostalAddress();
+ if (jQuery("#createPostalAddressForm").valid()) {
+ jQuery("<p>${uiLabelMap.CommonUpdatingData}</p>").insertBefore(createAddressForm);
+ createPartyPostalAddress();
+ }
},
'${uiLabelMap.CommonClose}': function() {
jQuery(this).dialog('close');
@@ -147,8 +149,11 @@ under the License.
buttons: {
'${uiLabelMap.CommonSubmit}': function() {
var createAddressForm = jQuery("#displayEditBillToPostalAddress");
- jQuery("<p>${uiLabelMap.CommonUpdatingData}</p>").insertBefore(createAddressForm);
- updatePartyBillToPostalAddress();
+ if (jQuery("#editBillToPostalAddress").valid()) {
+ jQuery("<p>${uiLabelMap.CommonUpdatingData}</p>").insertBefore(createAddressForm);
+ updatePartyBillToPostalAddress();
+ }
+
},
'${uiLabelMap.CommonClose}': function() {
jQuery(this).dialog('close');
@@ -195,8 +200,10 @@ under the License.
buttons: {
'${uiLabelMap.CommonSubmit}': function() {
var createAddressForm = jQuery("#displayEditShipToPostalAddress");
- jQuery("<p>${uiLabelMap.CommonUpdatingData}</p>").insertBefore(createAddressForm);
- updatePartyShipToPostalAddress('submitEditShipToPostalAddress');
+ if (jQuery("#editShipToPostalAddress").valid()) {
+ jQuery("<p>${uiLabelMap.CommonUpdatingData}</p>").insertBefore(createAddressForm);
+ updatePartyShipToPostalAddress('submitEditShipToPostalAddress');
+ }
},
'${uiLabelMap.CommonClose}': function() {
jQuery(this).dialog('close');
@@ -263,8 +270,10 @@ under the License.
buttons: {
'${uiLabelMap.CommonSubmit}': function() {
var createAddressForm = jQuery("#displayEditAddressForm_${contactMech.contactMechId}");
- jQuery("<p>${uiLabelMap.CommonUpdatingData}</p>").insertBefore(createAddressForm);
- updatePartyPostalAddress('submitEditPostalAddress_${contactMech.contactMechId}');
+ if (jQuery("#editPostalAddress_${contactMech.contactMechId}").valid()) {
+ jQuery("<p>${uiLabelMap.CommonUpdatingData}</p>").insertBefore(createAddressForm);
+ updatePartyPostalAddress('submitEditPostalAddress_${contactMech.contactMechId}');
+ }
},
'${uiLabelMap.CommonClose}': function() {
jQuery(this).dialog('close');
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/images/profile.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/images/profile.js?rev=1640111&r1=1640110&r2=1640111&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/images/profile.js (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/images/profile.js Mon Nov 17 09:11:33 2014
@@ -260,7 +260,6 @@ function updatePartyShipToPostalAddress(
function updatePartyBillToPostalAddress(e) {
formId = 'editBillToPostalAddress';
- var validateEditPostalAddress = new Validation(formId, {immediate: true, onSubmit: false});
errorId = 'billToServerError';
popupId = 'displayEditBillToPostalAddress';
requestUrl = 'updatePartyPostalAddress';
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumPermissionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumPermissionServices.xml?rev=1640111&r1=1640110&r2=1640111&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumPermissionServices.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumPermissionServices.xml Mon Nov 17 09:11:33 2014
@@ -519,7 +519,6 @@
</if-not-empty>
</if-not-empty>
</if-has-permission>
- <log level="verbose"></log>
<field-to-result field="hasPermission"/>
</simple-method>
<simple-method method-name="sprintUpdatePermission" short-description="Check Update Sprint Permission">