[Andromdaplugins-cvs] CVS update: cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud Controller.java.vsl

[Walter M. <wal...@us...>]

  User: walterim
  Date: 07/07/01 12:22:42

  Modified:    andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud
                        Controller.java.vsl
  Log:
  Using only not hidden parameters in the search
  
  Revision  Changes    Path
  1.7       +15 -1     cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud/Controller.java.vsl
  
  Index: Controller.java.vsl
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-jsf2/src/main/resources/templates/jsf2/controllers/crud/Controller.java.vsl,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -w -r1.6 -r1.7
  --- Controller.java.vsl	4 Mar 2007 19:08:34 -0000	1.6
  +++ Controller.java.vsl	1 Jul 2007 19:22:42 -0000	1.7
  @@ -309,7 +309,21 @@
   	}
   	
   	public void doSearch(${manageable.formBeanType} form) throws Exception {
  -        final java.util.List list = ${manageable.manageableServiceAccessorCall}.read(
  +	
  +		final java.util.List list;
  +		//if all search fields are null, call readAll()
  +		if(
  +#set ($and = '')
  +#foreach ($member in $manageable.manageableMembers)
  +#if(!$member.hidden)##não está funcionando($manageable.searchable($member))
  +            ${and} form.getSearchForm().${member.getterName}() == null
  +#set ($and = '&&')
  +#end
  +#end
  +			)
  +		list=${manageable.manageableServiceAccessorCall}.readAll();
  +	else	
  +        list = ${manageable.manageableServiceAccessorCall}.read(
   #set ($comma = '')
   #foreach ($member in $manageable.manageableMembers)
   #if(!$member.hidden)##não está funcionando($manageable.searchable($member))