Author: simoneg
Date: Wed Dec 16 18:02:42 2009
New Revision: 891353
URL: http://svn.apache.org/viewvc?rev=891353&view=rev
Log:
LABS-502 : fix for custom filters on SmartList
Modified:
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/SmartList.java
labs/magma/trunk/website-beansview/src/main/resources/org/apache/magma/website/beansview/dynaForm.js
Modified:
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/SmartList.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/SmartList.java?rev=891353&r1=891352&r2=891353&view=diff
==============================================================================
---
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/SmartList.java
(original)
+++
labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/SmartList.java
Wed Dec 16 18:02:42 2009
@@ -173,18 +173,20 @@
public HtmlProducer doShow() {
checkSortables();
if (this.withFilter) {
- if (this.sessionReservedQbe == null && this.tempQbe ==
null) {
- if (this.query == null || this.query.length()
== 0) {
- try {
- this.sessionReservedQbe =
this.myclass.newInstance();
- } catch (Exception e) {
- throw new MagmaException(e,
"Cannot initialize an empty {0} to use as query by example for filtering",
this.myclass);
+ if (this.sessionReservedQbe == null) {
+ if (this.tempQbe == null) {
+ if (this.query == null ||
this.query.length() == 0) {
+ try {
+ this.sessionReservedQbe
= this.myclass.newInstance();
+ } catch (Exception e) {
+ throw new
MagmaException(e, "Cannot initialize an empty {0} to use as query by example
for filtering", this.myclass);
+ }
+ } else {
+ throw new MagmaException("You
required a filter but also provided a query, you should either provide an empty
query or provide a query by example to use with the filter.");
}
} else {
- throw new MagmaException("You required
a filter but also provided a query, you should either provide an empty query or
provide a query by example to use with the filter.");
+ this.sessionReservedQbe = this.tempQbe;
}
- } else if (this.tempQbe != null) {
- this.sessionReservedQbe = this.tempQbe;
}
}
Database db = new Database();
Modified:
labs/magma/trunk/website-beansview/src/main/resources/org/apache/magma/website/beansview/dynaForm.js
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/website-beansview/src/main/resources/org/apache/magma/website/beansview/dynaForm.js?rev=891353&r1=891352&r2=891353&view=diff
==============================================================================
---
labs/magma/trunk/website-beansview/src/main/resources/org/apache/magma/website/beansview/dynaForm.js
(original)
+++
labs/magma/trunk/website-beansview/src/main/resources/org/apache/magma/website/beansview/dynaForm.js
Wed Dec 16 18:02:42 2009
@@ -46,20 +46,12 @@
$(this).addClass('block_' + rc);
form.df_labels[rc] = ($('label',labdiv).text());
form.df_blocks[rc] = this;
- if (field.type != 'checkbox') {
- if ($(field).val()) {
- DynaForm_set(form, rc);
- this.style.display='block';
- } else {
- form.df_set[rc] = false;
- }
+ var val =
$('input:radio:checked,input:checkbox:checked,input:text').val();
+ if (val && val != '') {
+ DynaForm_set(form, rc);
+ this.style.display='block';
} else {
- if (field.checked) {
- DynaForm_set(form, rc);
- this.style.display='block';
- } else {
- form.df_set[rc] = false;
- }
+ form.df_set[rc] = false;
}
rc++;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
