Project

General

Profile

« Previous | Next » 

Revision 09a9df91

Added by Andreas Kohlbecker over 5 years ago

ref #7572 also searching the institute titleCache when looking up for collections

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/view/occurrence/CollectionEditorPresenter.java
21 21 
import eu.etaxonomy.cdm.model.agent.AgentBase;
22 22 
import eu.etaxonomy.cdm.model.agent.Institution;
23 23 
import eu.etaxonomy.cdm.model.occurrence.Collection;
24 
import eu.etaxonomy.cdm.persistence.dao.common.Restriction;
25 
import eu.etaxonomy.cdm.persistence.dao.common.Restriction.Operator;
26 
import eu.etaxonomy.cdm.persistence.query.MatchMode;
24 27 
import eu.etaxonomy.cdm.service.CdmFilterablePagingProvider;
25 28 
import eu.etaxonomy.cdm.service.UserHelperAccess;
26 29 
import eu.etaxonomy.cdm.vaadin.event.CollectionEditorAction;
......
107 110 
        super.handleViewEntered();
108 111 

  		




  109
  112
  
    
        CdmFilterablePagingProvider<Collection, Collection> collectionPagingProvider = new CdmFilterablePagingProvider<Collection, Collection>(getRepo().getCollectionService());


  		




  
  113
  
    
        collectionPagingProvider.getRestrictions().add(new Restriction<String>("institute.titleCache", Operator.OR, MatchMode.ANYWHERE, CdmFilterablePagingProvider.QUERY_STRING_PLACEHOLDER));


  		




  110
  114
  
    
        getView().getSuperCollectionCombobox().getSelect().loadFrom(collectionPagingProvider, collectionPagingProvider, collectionPagingProvider.getPageSize());


  		




  111
  115
  
    
        getView().getSuperCollectionCombobox().getSelect().addValueChangeListener(new ToOneRelatedEntityReloader<Collection>(getView().getSuperCollectionCombobox(), this));


  		




  112
  116
  
    

  		




  ......




  189
  193
  
    
                    }


  		




  190
  194
  
    
                }


  		




  191
  195
  
    

  		




  192
  
  
    
            } else if(boundTargetField.matchesPropertyIdPath("institution")){


  		




  
  196
  
    
            } else if(boundTargetField.matchesPropertyIdPath("institute")){


  		




  193
  197
  
    
                if(event.isCreateOrModifiedType()){


  		




  194
  198
  
    

  		




  195
  199
  
    
                    Institution newInstitution = (Institution) event.getEntity();


  		












Also available in:  Unified diff