Field must be renamed so ZK injects it
FEA: ItEr74S04BugFixing
This commit is contained in:
parent
db27796183
commit
da985cf27f
3 changed files with 5 additions and 5 deletions
|
|
@ -28,7 +28,6 @@ import org.navalplanner.business.resources.entities.Criterion;
|
|||
import org.navalplanner.business.resources.entities.Resource;
|
||||
import org.navalplanner.web.common.components.ResourceAllocationBehaviour;
|
||||
import org.navalplanner.web.planner.allocation.INewAllocationsAdder;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.zkoss.zk.ui.util.GenericForwardComposer;
|
||||
|
||||
/**
|
||||
|
|
@ -38,9 +37,10 @@ import org.zkoss.zk.ui.util.GenericForwardComposer;
|
|||
public abstract class AllocationSelectorController extends
|
||||
GenericForwardComposer {
|
||||
|
||||
@Autowired
|
||||
protected IResourcesSearcher resourceSearchModel;
|
||||
// injected by name
|
||||
protected IResourcesSearcher resourcesSearcher;
|
||||
|
||||
// injected by name
|
||||
protected ResourceAllocationBehaviour behaviour;
|
||||
|
||||
public AllocationSelectorController() {
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ public class NewAllocationSelectorComboController extends
|
|||
}
|
||||
|
||||
private IResourcesQuery<?> query(ResourceEnum resourceEnum) {
|
||||
return resourceSearchModel.searchBy(resourceEnum);
|
||||
return resourcesSearcher.searchBy(resourceEnum);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -202,7 +202,7 @@ public class NewAllocationSelectorController extends
|
|||
}
|
||||
|
||||
private IResourcesQuery<?> query() {
|
||||
return currentAllocationType.doQueryOn(resourceSearchModel);
|
||||
return currentAllocationType.doQueryOn(resourcesSearcher);
|
||||
}
|
||||
|
||||
private void refreshListBoxResources() {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue