OFBiz › OFBiz - Commits

svn commit: r507564 - in /ofbiz/trunk/framework/widget: dtd/ src/org/ofbiz/widget/menu/ src/org/ofbiz/widget/screen/

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

jaz-3

svn commit: r507564 - in /ofbiz/trunk/framework/widget: dtd/ src/org/ofbiz/widget/menu/ src/org/ofbiz/widget/screen/

Author: jaz
Date: Wed Feb 14 07:08:54 2007
New Revision: 507564

URL: http://svn.apache.org/viewvc?view=rev&rev=507564
Log:
implemented if-service-permission for Menu Widgets

Modified:
ofbiz/trunk/framework/widget/dtd/widget-menu.xsd
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuCondition.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenCondition.java

Modified: ofbiz/trunk/framework/widget/dtd/widget-menu.xsd
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/dtd/widget-menu.xsd?view=diff&rev=507564&r1=507563&r2=507564
==============================================================================
--- ofbiz/trunk/framework/widget/dtd/widget-menu.xsd (original)
+++ ofbiz/trunk/framework/widget/dtd/widget-menu.xsd Wed Feb 14 07:08:54 2007
@@ -368,6 +368,25 @@
</xs:sequence>
</xs:complexType>
</xs:element>
+ <xs:element name="if-service-permission" substitutionGroup="AllConditionals">
+ <xs:complexType>
+ <xs:attributeGroup ref="attlist.if-service-permission"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:attributeGroup name="attlist.if-service-permission">
+ <xs:attribute type="xs:string" name="service-name" use="required"/>
+ <xs:attribute type="xs:string" name="resource-description" use="optional"/>
+ <xs:attribute name="main-action" use="optional">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="CREATE"/>
+ <xs:enumeration value="UPDATE"/>
+ <xs:enumeration value="DELETE"/>
+ <xs:enumeration value="VIEW"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:attributeGroup>
<xs:element name="if-has-permission" substitutionGroup="AllConditionals">
<xs:complexType>
<xs:attributeGroup ref="attlist.if-has-permission"/>

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java?view=diff&rev=507564&r1=507563&r2=507564
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java Wed Feb 14 07:08:54 2007
@@ -691,7 +691,7 @@
}

/**
- * @param boolean
+ * @param val
*/
public void setDefaultHideIfSelected(Boolean val) {
this.defaultHideIfSelected = val;

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuCondition.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuCondition.java?view=diff&rev=507564&r1=507563&r2=507564
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuCondition.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuCondition.java Wed Feb 14 07:08:54 2007
@@ -42,6 +42,7 @@
import org.ofbiz.entityext.permission.EntityPermissionChecker;
import org.ofbiz.minilang.operation.BaseCompare;
import org.ofbiz.security.Security;
+import org.ofbiz.service.*;
import org.w3c.dom.Element;

/**
@@ -118,6 +119,8 @@
return new Or(modelMenuItem, conditionElement);
} else if ("not".equals(conditionElement.getNodeName())) {
return new Not(modelMenuItem, conditionElement);
+ } else if ("if-service-permission".equals(conditionElement.getNodeName())) {
+ return new IfServicePermission(modelMenuItem, conditionElement);
} else if ("if-has-permission".equals(conditionElement.getNodeName())) {
return new IfHasPermission(modelMenuItem, conditionElement);
} else if ("if-validate-method".equals(conditionElement.getNodeName())) {
@@ -219,7 +222,78 @@
return !this.subCondition.eval(context);
}
}
-
+
+ public static class IfServicePermission extends MenuCondition {
+ protected FlexibleStringExpander serviceExdr;
+ protected FlexibleStringExpander actionExdr;
+ protected FlexibleStringExpander resExdr;
+
+ public IfServicePermission(ModelMenuItem modelMenuItem, Element condElement) {
+ super(modelMenuItem, condElement);
+ this.serviceExdr = new FlexibleStringExpander(condElement.getAttribute("service-name"));
+ this.actionExdr = new FlexibleStringExpander(condElement.getAttribute("main-action"));
+ this.resExdr = new FlexibleStringExpander(condElement.getAttribute("resource-description"));
+ }
+
+ public boolean eval(Map context) {
+ // if no user is logged in, treat as if the user does not have permission
+ GenericValue userLogin = (GenericValue) context.get("userLogin");
+ if (userLogin != null) {
+ String serviceName = serviceExdr.expandString(context);
+ String mainAction = actionExdr.expandString(context);
+ String resource = resExdr.expandString(context);
+ if (resource == null) {
+ resource = serviceName;
+ }
+
+ if (serviceName == null) {
+ Debug.logWarning("No permission service-name specified!", module);
+ return false;
+ }
+
+ // get the service objects
+ LocalDispatcher dispatcher = (LocalDispatcher) context.get("dispatcher");
+ DispatchContext dctx = dispatcher.getDispatchContext();
+
+ // get the service
+ ModelService permService;
+ try {
+ permService = dctx.getModelService(serviceName);
+ } catch (GenericServiceException e) {
+ Debug.logError(e, module);
+ return false;
+ }
+
+ if (permService != null) {
+ // build the context
+ Map svcCtx = permService.makeValid(context, ModelService.IN_PARAM);
+ svcCtx.put("resourceDescription", resource);
+ if (UtilValidate.isNotEmpty(mainAction)) {
+ svcCtx.put("mainAction", mainAction);
+ }
+
+ // invoke the service
+ Map resp;
+ try {
+ resp = dispatcher.runSync(permService.name, svcCtx, 300, true);
+ } catch (GenericServiceException e) {
+ Debug.logError(e, module);
+ return false;
+ }
+ if (ServiceUtil.isError(resp) || ServiceUtil.isFailure(resp)) {
+ Debug.logError(ServiceUtil.getErrorMessage(resp), module);
+ return false;
+ }
+ Boolean hasPermission = (Boolean) resp.get("hasPermission");
+ if (hasPermission != null) {
+ return hasPermission.booleanValue();
+ }
+ }
+ }
+ return false;
+ }
+ }
+
public static class IfHasPermission extends MenuCondition {
protected FlexibleStringExpander permissionExdr;
protected FlexibleStringExpander actionExdr;

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java?view=diff&rev=507564&r1=507563&r2=507564
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenuItem.java Wed Feb 14 07:08:54 2007
@@ -118,10 +118,8 @@
position = Integer.valueOf(positionStr);
}
} catch (Exception e) {
- Debug.logError(
- e,
- "Could not convert position attribute of the field element to an integer: [" + positionStr + "], using the default of the menu renderer",
- module);
+ Debug.logError(e, "Could not convert position attribute of the field element to an integer: [" +
+ positionStr + "], using the default of the menu renderer", module);
}

this.setAssociatedContentId( fieldElement.getAttribute("associated-content-id"));
@@ -150,6 +148,7 @@
throw new RuntimeException(errMsg);
}
}
+
Element linkElement = UtilXml.firstChildElement(fieldElement, "link");
//if (Debug.infoOn()) Debug.logInfo("in ModelMenuItem, linkElement:" + linkElement, module);
if (linkElement != null) {
@@ -516,7 +515,7 @@
}

/**
- * @param boolean
+ * @param val
*/
public void setHideIfSelected(Boolean val) {
this.hideIfSelected = val;
@@ -541,7 +540,7 @@
}

/**
- * @param boolean
+ * @param val
*/
public void setHasPermission(Boolean val) {
this.hasPermission = val;
@@ -555,16 +554,15 @@
}

public void dump(StringBuffer buffer ) {
- buffer.append("ModelMenuItem:"
- + "\n title=" + this.title
- + "\n name=" + this.name
- + "\n entityName=" + this.entityName
- + "\n titleStyle=" + this.titleStyle
- + "\n widgetStyle=" + this.widgetStyle
- + "\n tooltipStyle=" + this.tooltipStyle
- + "\n selectedStyle=" + this.selectedStyle
- + "\n\n");
-
+ buffer.append("ModelMenuItem:" + "\n title=")
+ .append(this.title).append("\n name=")
+ .append(this.name).append("\n entityName=")
+ .append(this.entityName).append("\n titleStyle=")
+ .append(this.titleStyle).append("\n widgetStyle=")
+ .append(this.widgetStyle).append("\n tooltipStyle=")
+ .append(this.tooltipStyle).append("\n selectedStyle=")
+ .append(this.selectedStyle)
+ .append("\n\n");
}

public Link getLink() {
@@ -572,253 +570,259 @@
}

public boolean isSelected(Map context) {
-
String currentMenuItemName = modelMenu.getSelectedMenuItemContextFieldName(context);
- if (currentMenuItemName != null && currentMenuItemName.equals(this.name))
- return true;
- else
- return false;
+ return currentMenuItemName != null && currentMenuItemName.equals(this.name);
}

+ public static class Link {

+ protected ModelMenuItem linkMenuItem;
+ protected FlexibleStringExpander textExdr;
+ protected FlexibleStringExpander idExdr;
+ protected FlexibleStringExpander styleExdr;
+ protected FlexibleStringExpander targetExdr;
+ protected FlexibleStringExpander targetWindowExdr;
+ protected FlexibleStringExpander prefixExdr;
+ protected FlexibleStringExpander nameExdr;
+ protected Image image;
+ protected String urlMode = "intra-app";
+ protected boolean fullPath = false;
+ protected boolean secure = false;
+ protected boolean encode = false;

+ public Link(Element linkElement, ModelMenuItem parentMenuItem) {

- public static class Link {
-
- protected ModelMenuItem linkMenuItem;
- protected FlexibleStringExpander textExdr;
- protected FlexibleStringExpander idExdr;
- protected FlexibleStringExpander styleExdr;
- protected FlexibleStringExpander targetExdr;
- protected FlexibleStringExpander targetWindowExdr;
- protected FlexibleStringExpander prefixExdr;
- protected FlexibleStringExpander nameExdr;
- protected Image image;
- protected String urlMode = "intra-app";
- protected boolean fullPath = false;
- protected boolean secure = false;
- protected boolean encode = false;
-
- public Link( Element linkElement, ModelMenuItem parentMenuItem) {
-
- this.linkMenuItem = parentMenuItem;
- setText(linkElement.getAttribute("text"));
- setId(linkElement.getAttribute("id"));
- setStyle(linkElement.getAttribute("style"));
- setTarget(linkElement.getAttribute("target"));
- setTargetWindow(linkElement.getAttribute("target-window"));
- setPrefix(linkElement.getAttribute("prefix"));
- setUrlMode(linkElement.getAttribute("url-mode"));
- setFullPath(linkElement.getAttribute("full-path"));
- setSecure(linkElement.getAttribute("secure"));
- setEncode(linkElement.getAttribute("encode"));
- setName(linkElement.getAttribute("name"));
- Element imageElement = UtilXml.firstChildElement(linkElement, "image");
- if (imageElement != null) {
- this.image = new Image(imageElement);
- }
-
- }
-
- public void renderLinkString(StringBuffer buffer, Map context, MenuStringRenderer menuStringRenderer) {
- menuStringRenderer.renderLink(buffer, context, this);
- }
-
- public String getText(Map context) {
- String txt = this.textExdr.expandString(context);
- if (UtilValidate.isEmpty(txt))
- txt = linkMenuItem.getTitle(context);
- return txt;
- }
-
- public String getId(Map context) {
- return this.idExdr.expandString(context);
- }
-
- public String getStyle(Map context) {
- String style = this.styleExdr.expandString(context);
- if (UtilValidate.isEmpty(style)) {
- style = this.linkMenuItem.getWidgetStyle();
- }
- return style;
- }
-
- public String getName(Map context) {
- return this.nameExdr.expandString(context);
- }
-
- public String getTarget(Map context) {
- return this.targetExdr.expandString(context);
- }
-
- public String getTargetWindow(Map context) {
- return this.targetWindowExdr.expandString(context);
- }
-
- public String getUrlMode() {
- return this.urlMode;
- }
-
- public String getPrefix(Map context) {
- return this.prefixExdr.expandString(context);
- }
-
- public boolean getFullPath() {
- return this.fullPath;
- }
-
- public boolean getSecure() {
- return this.secure;
- }
-
- public boolean getEncode() {
- return this.encode;
- }
-
- public Image getImage() {
- return this.image;
+ this.linkMenuItem = parentMenuItem;
+ setText(linkElement.getAttribute("text"));
+ setId(linkElement.getAttribute("id"));
+ setStyle(linkElement.getAttribute("style"));
+ setTarget(linkElement.getAttribute("target"));
+ setTargetWindow(linkElement.getAttribute("target-window"));
+ setPrefix(linkElement.getAttribute("prefix"));
+ setUrlMode(linkElement.getAttribute("url-mode"));
+ setFullPath(linkElement.getAttribute("full-path"));
+ setSecure(linkElement.getAttribute("secure"));
+ setEncode(linkElement.getAttribute("encode"));
+ setName(linkElement.getAttribute("name"));
+ Element imageElement = UtilXml.firstChildElement(linkElement, "image");
+ if (imageElement != null) {
+ this.image = new Image(imageElement);
}

- public void setText( String val ) {
- String textAttr = UtilFormatOut.checkNull(val);
- this.textExdr = new FlexibleStringExpander(textAttr);
- }
- public void setId( String val ) {
- this.idExdr = new FlexibleStringExpander(val);
- }
- public void setStyle( String val ) {
- this.styleExdr = new FlexibleStringExpander(val);
- }
- public void setTarget( String val ) {
- this.targetExdr = new FlexibleStringExpander(val);
- }
- public void setTargetWindow( String val ) {
- this.targetWindowExdr = new FlexibleStringExpander(val);
- }
- public void setPrefix( String val ) {
- this.prefixExdr = new FlexibleStringExpander(val);
- }
- public void setUrlMode( String val ) {
- if (UtilValidate.isNotEmpty(val))
- this.urlMode = val;
- }
- public void setName( String val ) {
- this.nameExdr = new FlexibleStringExpander(val);
- }
- public void setFullPath( String val ) {
- String sFullPath = val;
- if (sFullPath != null && sFullPath.equalsIgnoreCase("true"))
- this.fullPath = true;
- else
- this.fullPath = false;
- }
+ }

- public void setSecure( String val ) {
- String sSecure = val;
- if (sSecure != null && sSecure.equalsIgnoreCase("true"))
- this.secure = true;
- else
- this.secure = false;
- }
+ public void renderLinkString(StringBuffer buffer, Map context, MenuStringRenderer menuStringRenderer) {
+ menuStringRenderer.renderLink(buffer, context, this);
+ }

- public void setEncode( String val ) {
- String sEncode = val;
- if (sEncode != null && sEncode.equalsIgnoreCase("true"))
- this.encode = true;
- else
- this.encode = false;
- }
- public void setImage( Image img ) {
- this.image = img;
- }
-
- public ModelMenuItem getLinkMenuItem() {
- return linkMenuItem;
- }
-
+ public String getText(Map context) {
+ String txt = this.textExdr.expandString(context);
+ if (UtilValidate.isEmpty(txt))
+ txt = linkMenuItem.getTitle(context);
+ return txt;
}

- public static class Image {
+ public String getId(Map context) {
+ return this.idExdr.expandString(context);
+ }

- protected FlexibleStringExpander srcExdr;
- protected FlexibleStringExpander idExdr;
- protected FlexibleStringExpander styleExdr;
- protected FlexibleStringExpander widthExdr;
- protected FlexibleStringExpander heightExdr;
- protected FlexibleStringExpander borderExdr;
- protected String urlMode;
-
- public Image( Element imageElement) {
-
- setSrc(imageElement.getAttribute("src"));
- setId(imageElement.getAttribute("id"));
- setStyle(imageElement.getAttribute("style"));
- setWidth(imageElement.getAttribute("width"));
- setHeight(imageElement.getAttribute("height"));
- setBorder(UtilFormatOut.checkEmpty(imageElement.getAttribute("border"), "0"));
- setUrlMode(UtilFormatOut.checkEmpty(imageElement.getAttribute("url-mode"), "content"));
-
- }
-
- public void renderImageString(StringBuffer buffer, Map context, MenuStringRenderer menuStringRenderer) {
- menuStringRenderer.renderImage(buffer, context, this);
- }
-
- public String getSrc(Map context) {
- return this.srcExdr.expandString(context);
- }
-
- public String getId(Map context) {
- return this.idExdr.expandString(context);
- }
-
- public String getStyle(Map context) {
- return this.styleExdr.expandString(context);
+ public String getStyle(Map context) {
+ String style = this.styleExdr.expandString(context);
+ if (UtilValidate.isEmpty(style)) {
+ style = this.linkMenuItem.getWidgetStyle();
}
+ return style;
+ }

- public String getWidth(Map context) {
- return this.widthExdr.expandString(context);
- }
+ public String getName(Map context) {
+ return this.nameExdr.expandString(context);
+ }

- public String getHeight(Map context) {
- return this.heightExdr.expandString(context);
- }
+ public String getTarget(Map context) {
+ return this.targetExdr.expandString(context);
+ }

- public String getBorder(Map context) {
- return this.borderExdr.expandString(context);
- }
-
- public String getUrlMode() {
- return this.urlMode;
- }
-
- public void setSrc( String val ) {
- String textAttr = UtilFormatOut.checkNull(val);
- this.srcExdr = new FlexibleStringExpander(textAttr);
- }
- public void setId( String val ) {
- this.idExdr = new FlexibleStringExpander(val);
- }
- public void setStyle( String val ) {
- this.styleExdr = new FlexibleStringExpander(val);
- }
- public void setWidth( String val ) {
- this.widthExdr = new FlexibleStringExpander(val);
- }
- public void setHeight( String val ) {
- this.heightExdr = new FlexibleStringExpander(val);
- }
- public void setBorder( String val ) {
- this.borderExdr = new FlexibleStringExpander(val);
- }
- public void setUrlMode( String val ) {
- if (UtilValidate.isEmpty(val))
- this.urlMode = "content";
- else
- this.urlMode = val;
- }
-
+ public String getTargetWindow(Map context) {
+ return this.targetWindowExdr.expandString(context);
}

-
+ public String getUrlMode() {
+ return this.urlMode;
+ }
+
+ public String getPrefix(Map context) {
+ return this.prefixExdr.expandString(context);
+ }
+
+ public boolean getFullPath() {
+ return this.fullPath;
+ }
+
+ public boolean getSecure() {
+ return this.secure;
+ }
+
+ public boolean getEncode() {
+ return this.encode;
+ }
+
+ public Image getImage() {
+ return this.image;
+ }
+
+ public void setText(String val) {
+ String textAttr = UtilFormatOut.checkNull(val);
+ this.textExdr = new FlexibleStringExpander(textAttr);
+ }
+
+ public void setId(String val) {
+ this.idExdr = new FlexibleStringExpander(val);
+ }
+
+ public void setStyle(String val) {
+ this.styleExdr = new FlexibleStringExpander(val);
+ }
+
+ public void setTarget(String val) {
+ this.targetExdr = new FlexibleStringExpander(val);
+ }
+
+ public void setTargetWindow(String val) {
+ this.targetWindowExdr = new FlexibleStringExpander(val);
+ }
+
+ public void setPrefix(String val) {
+ this.prefixExdr = new FlexibleStringExpander(val);
+ }
+
+ public void setUrlMode(String val) {
+ if (UtilValidate.isNotEmpty(val))
+ this.urlMode = val;
+ }
+
+ public void setName(String val) {
+ this.nameExdr = new FlexibleStringExpander(val);
+ }
+
+ public void setFullPath(String val) {
+ String sFullPath = val;
+ if (sFullPath != null && sFullPath.equalsIgnoreCase("true"))
+ this.fullPath = true;
+ else
+ this.fullPath = false;
+ }
+
+ public void setSecure(String val) {
+ String sSecure = val;
+ if (sSecure != null && sSecure.equalsIgnoreCase("true"))
+ this.secure = true;
+ else
+ this.secure = false;
+ }
+
+ public void setEncode(String val) {
+ String sEncode = val;
+ if (sEncode != null && sEncode.equalsIgnoreCase("true"))
+ this.encode = true;
+ else
+ this.encode = false;
+ }
+
+ public void setImage(Image img) {
+ this.image = img;
+ }
+
+ public ModelMenuItem getLinkMenuItem() {
+ return linkMenuItem;
+ }
+
+ }
+
+ public static class Image {
+
+ protected FlexibleStringExpander srcExdr;
+ protected FlexibleStringExpander idExdr;
+ protected FlexibleStringExpander styleExdr;
+ protected FlexibleStringExpander widthExdr;
+ protected FlexibleStringExpander heightExdr;
+ protected FlexibleStringExpander borderExdr;
+ protected String urlMode;
+
+ public Image(Element imageElement) {
+
+ setSrc(imageElement.getAttribute("src"));
+ setId(imageElement.getAttribute("id"));
+ setStyle(imageElement.getAttribute("style"));
+ setWidth(imageElement.getAttribute("width"));
+ setHeight(imageElement.getAttribute("height"));
+ setBorder(UtilFormatOut.checkEmpty(imageElement.getAttribute("border"), "0"));
+ setUrlMode(UtilFormatOut.checkEmpty(imageElement.getAttribute("url-mode"), "content"));
+
+ }
+
+ public void renderImageString(StringBuffer buffer, Map context, MenuStringRenderer menuStringRenderer) {
+ menuStringRenderer.renderImage(buffer, context, this);
+ }
+
+ public String getSrc(Map context) {
+ return this.srcExdr.expandString(context);
+ }
+
+ public String getId(Map context) {
+ return this.idExdr.expandString(context);
+ }
+
+ public String getStyle(Map context) {
+ return this.styleExdr.expandString(context);
+ }
+
+ public String getWidth(Map context) {
+ return this.widthExdr.expandString(context);
+ }
+
+ public String getHeight(Map context) {
+ return this.heightExdr.expandString(context);
+ }
+
+ public String getBorder(Map context) {
+ return this.borderExdr.expandString(context);
+ }
+
+ public String getUrlMode() {
+ return this.urlMode;
+ }
+
+ public void setSrc(String val) {
+ String textAttr = UtilFormatOut.checkNull(val);
+ this.srcExdr = new FlexibleStringExpander(textAttr);
+ }
+
+ public void setId(String val) {
+ this.idExdr = new FlexibleStringExpander(val);
+ }
+
+ public void setStyle(String val) {
+ this.styleExdr = new FlexibleStringExpander(val);
+ }
+
+ public void setWidth(String val) {
+ this.widthExdr = new FlexibleStringExpander(val);
+ }
+
+ public void setHeight(String val) {
+ this.heightExdr = new FlexibleStringExpander(val);
+ }
+
+ public void setBorder(String val) {
+ this.borderExdr = new FlexibleStringExpander(val);
+ }
+
+ public void setUrlMode(String val) {
+ if (UtilValidate.isEmpty(val))
+ this.urlMode = "content";
+ else
+ this.urlMode = val;
+ }
+
+ }
}

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenCondition.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenCondition.java?view=diff&rev=507564&r1=507563&r2=507564
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenCondition.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenCondition.java Wed Feb 14 07:08:54 2007
@@ -211,8 +211,7 @@
super(modelScreen, condElement);
this.serviceExdr = new FlexibleStringExpander(condElement.getAttribute("service-name"));
this.actionExdr = new FlexibleStringExpander(condElement.getAttribute("main-action"));
- this.resExdr = new FlexibleStringExpander(condElement.getAttribute("resource-description"));
- Debug.logInfo("IfServicePermission running: " + condElement.getAttribute("service-name"), module);
+ this.resExdr = new FlexibleStringExpander(condElement.getAttribute("resource-description"));
}

public boolean eval(Map context) {