You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2012/03/19 09:25:07 UTC
svn commit: r1302320 - in
/ofbiz/trunk/framework/widget/src/org/ofbiz/widget: ModelWidgetAction.java
form/ModelFormAction.java menu/ModelMenuAction.java
screen/ModelScreenAction.java
Author: hansbak
Date: Mon Mar 19 08:25:06 2012
New Revision: 1302320
URL: http://svn.apache.org/viewvc?rev=1302320&view=rev
Log:
OFBIZ-4730 make <property-to-field/> in widget firstly lookup up the SystemProperty entity and then the properties file, contribution of Leon
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ModelWidgetAction.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuAction.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ModelWidgetAction.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ModelWidgetAction.java?rev=1302320&r1=1302319&r2=1302320&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ModelWidgetAction.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ModelWidgetAction.java Mon Mar 19 08:25:06 2012
@@ -52,6 +52,7 @@ import org.ofbiz.entity.finder.ByAndFind
import org.ofbiz.entity.finder.ByConditionFinder;
import org.ofbiz.entity.finder.EntityFinderUtil;
import org.ofbiz.entity.finder.PrimaryKeyFinder;
+import org.ofbiz.entity.util.EntityUtilProperties;
import org.ofbiz.minilang.MiniLangException;
import org.ofbiz.minilang.SimpleMethod;
import org.ofbiz.minilang.method.MethodContext;
@@ -364,9 +365,9 @@ public abstract class ModelWidgetAction
String value = null;
if (noLocale) {
- value = UtilProperties.getPropertyValue(resource, property);
+ value = EntityUtilProperties.getPropertyValue(resource, property, WidgetWorker.getDelegator(context));
} else {
- value = UtilProperties.getMessage(resource, property, locale);
+ value = EntityUtilProperties.getMessage(resource, property, locale, WidgetWorker.getDelegator(context));
}
if (UtilValidate.isEmpty(value)) {
value = this.defaultExdr.expandString(context);
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java?rev=1302320&r1=1302319&r2=1302320&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java Mon Mar 19 08:25:06 2012
@@ -45,6 +45,7 @@ import org.ofbiz.entity.finder.ByAndFind
import org.ofbiz.entity.finder.ByConditionFinder;
import org.ofbiz.entity.finder.EntityFinderUtil;
import org.ofbiz.entity.finder.PrimaryKeyFinder;
+import org.ofbiz.entity.util.EntityUtilProperties;
import org.ofbiz.minilang.MiniLangException;
import org.ofbiz.minilang.SimpleMethod;
import org.ofbiz.minilang.method.MethodContext;
@@ -247,9 +248,9 @@ public abstract class ModelFormAction {
String value = null;
if (noLocale) {
- value = UtilProperties.getPropertyValue(resource, property);
+ value = EntityUtilProperties.getPropertyValue(resource, property, WidgetWorker.getDelegator(context));
} else {
- value = UtilProperties.getMessage(resource, property, locale);
+ value = EntityUtilProperties.getMessage(resource, property, locale, WidgetWorker.getDelegator(context));
}
if (UtilValidate.isEmpty(value)) {
value = this.defaultExdr.expandString(context);
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuAction.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuAction.java?rev=1302320&r1=1302319&r2=1302320&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuAction.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuAction.java Mon Mar 19 08:25:06 2012
@@ -46,6 +46,7 @@ import org.ofbiz.base.util.string.Flexib
import org.ofbiz.entity.finder.ByAndFinder;
import org.ofbiz.entity.finder.ByConditionFinder;
import org.ofbiz.entity.finder.PrimaryKeyFinder;
+import org.ofbiz.entity.util.EntityUtilProperties;
import org.ofbiz.service.GenericServiceException;
import org.ofbiz.service.ModelService;
import org.ofbiz.widget.WidgetWorker;
@@ -323,9 +324,9 @@ public abstract class ModelMenuAction {
String value = null;
if (noLocale) {
- value = UtilProperties.getPropertyValue(resource, property);
+ value = EntityUtilProperties.getPropertyValue(resource, property, WidgetWorker.getDelegator(context));
} else {
- value = UtilProperties.getMessage(resource, property, locale);
+ value = EntityUtilProperties.getMessage(resource, property, locale, WidgetWorker.getDelegator(context));
}
if (UtilValidate.isEmpty(value)) {
value = this.defaultExdr.expandString(context);
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java?rev=1302320&r1=1302319&r2=1302320&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java Mon Mar 19 08:25:06 2012
@@ -51,6 +51,7 @@ import org.ofbiz.entity.finder.ByAndFind
import org.ofbiz.entity.finder.ByConditionFinder;
import org.ofbiz.entity.finder.EntityFinderUtil;
import org.ofbiz.entity.finder.PrimaryKeyFinder;
+import org.ofbiz.entity.util.EntityUtilProperties;
import org.ofbiz.minilang.MiniLangException;
import org.ofbiz.minilang.SimpleMethod;
import org.ofbiz.minilang.method.MethodContext;
@@ -374,9 +375,9 @@ public abstract class ModelScreenAction
String value = null;
if (noLocale) {
- value = UtilProperties.getPropertyValue(resource, property);
+ value = EntityUtilProperties.getPropertyValue(resource, property, WidgetWorker.getDelegator(context));
} else {
- value = UtilProperties.getMessage(resource, property, locale);
+ value = EntityUtilProperties.getMessage(resource, property, locale, WidgetWorker.getDelegator(context));
}
if (UtilValidate.isEmpty(value)) {
value = this.defaultExdr.expandString(context);