Tomas Jelinek has uploaded a new change for review. Change subject: Set up the correct search queries ......................................................................
Set up the correct search queries Change-Id: Id787b9feea737e05e4d2c95a626d40070b48a1e2 Signed-off-by: Tomas Jelinek <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/ImageListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/InstanceTypeListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmWithInstanceTypeModelBehavior.java 4 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/98/12498/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/ImageListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/ImageListModel.java index dfb3abd..036cc85 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/ImageListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/ImageListModel.java @@ -15,7 +15,7 @@ public ImageListModel() { super(ConstantsManager.getInstance().getConstants().imagesTitle()); - setDefaultSearchString("Template:type = IMAGE"); //$NON-NLS-1$ + setDefaultSearchString("Imagetype:"); //$NON-NLS-1$ setSearchString(getDefaultSearchString()); } @@ -42,7 +42,7 @@ @Override protected void SyncSearch() { - SearchParameters tempVar = new SearchParameters(getSearchString(), SearchType.VmTemplate); //$NON-NLS-1$ + SearchParameters tempVar = new SearchParameters(getSearchString(), SearchType.ImageType); //$NON-NLS-1$ tempVar.setMaxCount(getSearchPageSize()); super.SyncSearch(VdcQueryType.Search, tempVar); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/InstanceTypeListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/InstanceTypeListModel.java index f520bb4..db664c3 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/InstanceTypeListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/InstanceTypeListModel.java @@ -43,7 +43,7 @@ public InstanceTypeListModel() { super(ConstantsManager.getInstance().getConstants().templatesTitle()); - setDefaultSearchString("Template:type = INSTANCE"); //$NON-NLS-1$ + setDefaultSearchString("Instancetype:"); //$NON-NLS-1$ setSearchString(getDefaultSearchString()); setNewInstanceTypeCommand(new UICommand("newInstanceType", this)); //$NON-NLS-1$ @@ -132,7 +132,7 @@ @Override protected void SyncSearch() { - SearchParameters tempVar = new SearchParameters(getSearchString(), SearchType.VmTemplate); //$NON-NLS-1$ + SearchParameters tempVar = new SearchParameters(getSearchString(), SearchType.InstanceType); //$NON-NLS-1$ tempVar.setMaxCount(getSearchPageSize()); super.SyncSearch(VdcQueryType.Search, tempVar); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java index a2407ec..dabed55 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java @@ -147,7 +147,7 @@ setTitle(ConstantsManager.getInstance().getConstants().templatesTitle()); - setDefaultSearchString("Template:type = TEMPLATE"); //$NON-NLS-1$ + setDefaultSearchString("Template:"); //$NON-NLS-1$ setSearchString(getDefaultSearchString()); setSearchObjects(new String[] { SearchObjects.TEMPLATE_OBJ_NAME, SearchObjects.TEMPLATE_PLU_OBJ_NAME }); setAvailableInModes(ApplicationMode.VirtOnly); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmWithInstanceTypeModelBehavior.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmWithInstanceTypeModelBehavior.java index e7d0865..d1de8a3 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmWithInstanceTypeModelBehavior.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmWithInstanceTypeModelBehavior.java @@ -17,8 +17,8 @@ @Override protected void PostInitTemplate(ArrayList<VmTemplate> templates) { super.PostInitTemplate(templates); - SearchParameters instanceTypeParams = new SearchParameters("Template:type = INSTANCE", SearchType.VmTemplate); //$NON-NLS-1$ - SearchParameters imageTypeParams = new SearchParameters("Template:type = IMAGE", SearchType.VmTemplate); //$NON-NLS-1$ + SearchParameters instanceTypeParams = new SearchParameters("InstanceType:", SearchType.InstanceType); //$NON-NLS-1$ + SearchParameters imageTypeParams = new SearchParameters("ImageType:", SearchType.ImageType); //$NON-NLS-1$ new BuilderExecutor<VM, UnitVmModel>( new QueryToListBuilder<VM, UnitVmModel>(instanceTypeParams, getModel().getInstanceType()), -- To view, visit http://gerrit.ovirt.org/12498 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id787b9feea737e05e4d2c95a626d40070b48a1e2 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tomas Jelinek <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
