Author: simoneg
Date: Mon Dec 14 12:50:52 2009
New Revision: 890298
URL: http://svn.apache.org/viewvc?rev=890298&view=rev
Log:
LABS-502 : avoid displaying required fields when there is no validation (like
in filters)
Modified:
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/BeanFormProducer.java
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/BeanStyle.java
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/SmartForm.java
Modified:
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/BeanFormProducer.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/BeanFormProducer.java?rev=890298&r1=890297&r2=890298&view=diff
==============================================================================
---
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/BeanFormProducer.java
(original)
+++
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/BeanFormProducer.java
Mon Dec 14 12:50:52 2009
@@ -54,6 +54,7 @@
protected String code;
protected BeanHandler handler;
protected List<FormAction> actions;
+ protected boolean withoutValidation;
public BeanFormProducer(Object bean, List<LocalizableStringWithSubject>
errors, String code, String... layers) {
super(bean, layers);
@@ -73,6 +74,7 @@
beanStyle = new BeanStyleTable();
}
beanStyle.setWithCustomClasses(true);
+ beanStyle.setWithoutValidation(this.withoutValidation);
out.write("<form name=\"form" + this.code + "\"
action=\"filled\" method=\"post\" enctype=\"multipart/form-data\"
accept-charset=\"utf-8\"><div>");
out.write("<input type=\"submit\"
class=\"DefaultHiddenSubmit\" value=\"-\"/>");
out.flush();
@@ -215,6 +217,14 @@
return ret;
}
+ public boolean isWithoutValidation() {
+ return withoutValidation;
+ }
+
+ public void setWithoutValidation(boolean withoutValidation) {
+ this.withoutValidation = withoutValidation;
+ }
+
/*
@Override
protected void createLabelNodeOutput(LabelNode node, Writer out) throws
IOException {
Modified:
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/BeanStyle.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/BeanStyle.java?rev=890298&r1=890297&r2=890298&view=diff
==============================================================================
---
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/BeanStyle.java
(original)
+++
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/BeanStyle.java
Mon Dec 14 12:50:52 2009
@@ -62,6 +62,7 @@
protected RootNode root;
protected StringBuilder buff;
protected boolean withCustomClasses;
+ protected boolean withoutValidation;
protected int maxFieldSize = 80;
protected String outerCssClass = null;
@@ -93,6 +94,10 @@
this.elementCssClass = elementCssClass;
}
+ public void setWithoutValidation(boolean withoutValidation) {
+ this.withoutValidation = withoutValidation;
+ }
+
@LateConfigurationTrigger
public void generate() {
buff = new StringBuilder();
@@ -211,7 +216,7 @@
if (withCustomClasses) {
PropertyInfo property = node.getProperty();
CompoundValidator allvals = property.getValidator();
- if (allvals != null && !allvals.acceptsNulls()) {
+ if (allvals != null && !allvals.acceptsNulls() &&
!withoutValidation) {
baseclass += " NotNullable";
}
if (!property.isWriteable()) {
@@ -257,7 +262,7 @@
baseclass += " ForBean";
}
}
- if (withCustomClasses) {
+ if (withCustomClasses && !withoutValidation) {
CompoundValidator allvals =
node.getProperty().getValidator();
if (allvals != null && !allvals.acceptsNulls()) {
baseclass += " NotNullable";
@@ -300,7 +305,7 @@
}
public String getStyleKey() {
- return "CC" + this.withCustomClasses + "MF" + this.maxFieldSize
+ "CSS" + this.outerCssClass + this.elementCssClass;
+ return "CC" + this.withCustomClasses + "WV" +
this.withoutValidation + "MF" + this.maxFieldSize + "CSS" + this.outerCssClass
+ this.elementCssClass;
}
protected void openOuterContainer() {
Modified:
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/SmartForm.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/SmartForm.java?rev=890298&r1=890297&r2=890298&view=diff
==============================================================================
---
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/SmartForm.java
(original)
+++
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/SmartForm.java
Mon Dec 14 12:50:52 2009
@@ -141,6 +141,7 @@
producer.setBeanStyle(this.beanStyle);
producer.setOuterCssClass(outerCssClass);
producer.setElementCssClass(elementCssClass);
+ producer.setWithoutValidation(dontValidate);
producer.compoundWith(prodHeader, CompoundType.BEFORE);
producer.compoundWith(prodFooter, CompoundType.AFTER);
return producer;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
