Kanagaraj M has uploaded a new change for review. Change subject: engine: controlling search based on Application Mode ......................................................................
engine: controlling search based on Application Mode Search auto completion is filtered based on Application Mode. All the virt related search attributes will be listed in the auto-completion only if the current application mode supports Virt. like wise gluster related fields will appear only if the application mode supports Gluster. Change-Id: Ia2e9293bb26616a170a3edcc2184cce748cbc9c0 Signed-off-by: Kanagaraj M <[email protected]> --- A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/mode/ApplicationModeUtil.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/AuditCrossRefAutoCompleter.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/AuditLogConditionFieldAutoCompleter.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/ClusterCrossRefAutoCompleter.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerFactory.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/UserCrossRefAutoCompleter.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VdsConditionFieldAutoCompleter.java M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VdsCrossRefAutoCompleter.java M backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerFactoryTest.java M frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/autocomplete/SearchSuggestModel.java 11 files changed, 104 insertions(+), 38 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/04/13704/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/mode/ApplicationModeUtil.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/mode/ApplicationModeUtil.java new file mode 100644 index 0000000..32cbb50 --- /dev/null +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/mode/ApplicationModeUtil.java @@ -0,0 +1,12 @@ +package org.ovirt.engine.core.common.mode; + +public class ApplicationModeUtil { + + public static boolean isVirtSupported(ApplicationMode applicationMode) { + return (applicationMode.getValue() & ApplicationMode.VirtOnly.getValue()) > 0; + } + + public static boolean isGlusterSupported(ApplicationMode applicationMode) { + return (applicationMode.getValue() & ApplicationMode.GlusterOnly.getValue()) > 0; + } +} diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/AuditCrossRefAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/AuditCrossRefAutoCompleter.java index 4b9b937..e913e8c 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/AuditCrossRefAutoCompleter.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/AuditCrossRefAutoCompleter.java @@ -1,14 +1,23 @@ package org.ovirt.engine.core.searchbackend; +import org.ovirt.engine.core.common.mode.ApplicationModeUtil; + public class AuditCrossRefAutoCompleter extends SearchObjectsBaseAutoCompleter { public AuditCrossRefAutoCompleter() { - mVerbs.put(SearchObjects.VM_PLU_OBJ_NAME, SearchObjects.VM_PLU_OBJ_NAME); + if (ApplicationModeUtil.isVirtSupported(SyntaxCheckerFactory.getApplicationMode())) { + mVerbs.put(SearchObjects.VM_PLU_OBJ_NAME, SearchObjects.VM_PLU_OBJ_NAME); + mVerbs.put(SearchObjects.TEMPLATE_PLU_OBJ_NAME, SearchObjects.TEMPLATE_PLU_OBJ_NAME); + mVerbs.put(SearchObjects.QUOTA_OBJ_NAME, SearchObjects.QUOTA_OBJ_NAME); + } + + if (ApplicationModeUtil.isGlusterSupported(SyntaxCheckerFactory.getApplicationMode())) { + mVerbs.put(SearchObjects.GLUSTER_VOLUME_PLU_OBJ_NAME, SearchObjects.GLUSTER_VOLUME_PLU_OBJ_NAME); + } + mVerbs.put(SearchObjects.VDS_PLU_OBJ_NAME, SearchObjects.VDS_PLU_OBJ_NAME); - mVerbs.put(SearchObjects.TEMPLATE_PLU_OBJ_NAME, SearchObjects.TEMPLATE_PLU_OBJ_NAME); mVerbs.put(SearchObjects.VDC_USER_PLU_OBJ_NAME, SearchObjects.VDC_USER_PLU_OBJ_NAME); mVerbs.put(SearchObjects.VDC_CLUSTER_PLU_OBJ_NAME, SearchObjects.VDC_CLUSTER_PLU_OBJ_NAME); - mVerbs.put(SearchObjects.GLUSTER_VOLUME_PLU_OBJ_NAME, SearchObjects.GLUSTER_VOLUME_PLU_OBJ_NAME); - mVerbs.put(SearchObjects.QUOTA_OBJ_NAME, SearchObjects.QUOTA_OBJ_NAME); + buildCompletions(); mVerbs.put(SearchObjects.VM_OBJ_NAME, SearchObjects.VM_OBJ_NAME); mVerbs.put(SearchObjects.VDS_OBJ_NAME, SearchObjects.VDS_OBJ_NAME); diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/AuditLogConditionFieldAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/AuditLogConditionFieldAutoCompleter.java index d489410..b404896 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/AuditLogConditionFieldAutoCompleter.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/AuditLogConditionFieldAutoCompleter.java @@ -2,6 +2,7 @@ import org.ovirt.engine.core.common.AuditLogSeverity; import org.ovirt.engine.core.common.businessentities.DateEnumForSearch; +import org.ovirt.engine.core.common.mode.ApplicationModeUtil; public class AuditLogConditionFieldAutoCompleter extends BaseConditionFieldAutoCompleter { public AuditLogConditionFieldAutoCompleter() { @@ -13,11 +14,15 @@ mVerbs.put("TIME", "TIME"); mVerbs.put("USRNAME", "USRNAME"); mVerbs.put("EVENT_HOST", "EVENT_HOST"); - mVerbs.put("EVENT_VM", "EVENT_VM"); - mVerbs.put("EVENT_TEMPLATE", "EVENT_TEMPLATE"); - mVerbs.put("EVENT_STORAGE", "EVENT_STORAGE"); - mVerbs.put("EVENT_DATACENTER", "EVENT_DATACENTER"); - mVerbs.put("EVENT_VOLUME", "EVENT_VOLUME"); + if (ApplicationModeUtil.isVirtSupported(SyntaxCheckerFactory.getApplicationMode())) { + mVerbs.put("EVENT_VM", "EVENT_VM"); + mVerbs.put("EVENT_TEMPLATE", "EVENT_TEMPLATE"); + mVerbs.put("EVENT_STORAGE", "EVENT_STORAGE"); + mVerbs.put("EVENT_DATACENTER", "EVENT_DATACENTER"); + } + if (ApplicationModeUtil.isGlusterSupported(SyntaxCheckerFactory.getApplicationMode())) { + mVerbs.put("EVENT_VOLUME", "EVENT_VOLUME"); + } mVerbs.put("CORRELATION_ID", "CORRELATION_ID"); mVerbs.put("ORIGIN", "ORIGIN"); mVerbs.put("CUSTOM_EVENT_ID", "CUSTOM_EVENT_ID"); @@ -25,12 +30,14 @@ buildCompletions(); // These search options remain hidden from the autocompletion // but still available for the user interface - mVerbs.put("_EVENT_VM_ID", "_EVENT_VM_ID"); - mVerbs.put("_EVENT_TEMPLATE_ID", "_EVENT_TEMPLATE_ID"); - mVerbs.put("_EVENT_STORAGE_ID", "_EVENT_STORAGE_ID"); + if (ApplicationModeUtil.isVirtSupported(SyntaxCheckerFactory.getApplicationMode())) { + mVerbs.put("_EVENT_VM_ID", "_EVENT_VM_ID"); + mVerbs.put("_EVENT_TEMPLATE_ID", "_EVENT_TEMPLATE_ID"); + mVerbs.put("_EVENT_STORAGE_ID", "_EVENT_STORAGE_ID"); + mVerbs.put("_EVENT_DATACENTER_ID", "_EVENT_DATACENTER_ID"); + mVerbs.put("_EVENT_QUOTA_ID", "_EVENT_QUOTA_ID"); + } mVerbs.put("_EVENT_HOST_ID", "_EVENT_HOST_ID"); - mVerbs.put("_EVENT_DATACENTER_ID", "_EVENT_DATACENTER_ID"); - mVerbs.put("_EVENT_QUOTA_ID", "_EVENT_QUOTA_ID"); mVerbs.put("USRID", "USRID"); // Building the autoCompletion Dict // Building the types dict diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/ClusterCrossRefAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/ClusterCrossRefAutoCompleter.java index 1e4b97b..c19002c 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/ClusterCrossRefAutoCompleter.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/ClusterCrossRefAutoCompleter.java @@ -1,10 +1,14 @@ package org.ovirt.engine.core.searchbackend; +import org.ovirt.engine.core.common.mode.ApplicationModeUtil; + public class ClusterCrossRefAutoCompleter extends SearchObjectsBaseAutoCompleter { public ClusterCrossRefAutoCompleter() { - mVerbs.put(SearchObjects.VDC_STORAGE_POOL_OBJ_NAME, SearchObjects.VDC_STORAGE_POOL_OBJ_NAME); - mVerbs.put(SearchObjects.VDC_STORAGE_DOMAIN_OBJ_NAME, SearchObjects.VDC_STORAGE_DOMAIN_OBJ_NAME); - mVerbs.put(SearchObjects.NETWORK_CLUSTER_OBJ_NAME, SearchObjects.NETWORK_CLUSTER_OBJ_NAME); + if (ApplicationModeUtil.isVirtSupported(SyntaxCheckerFactory.getApplicationMode())) { + mVerbs.put(SearchObjects.VDC_STORAGE_POOL_OBJ_NAME, SearchObjects.VDC_STORAGE_POOL_OBJ_NAME); + mVerbs.put(SearchObjects.VDC_STORAGE_DOMAIN_OBJ_NAME, SearchObjects.VDC_STORAGE_DOMAIN_OBJ_NAME); + mVerbs.put(SearchObjects.NETWORK_CLUSTER_OBJ_NAME, SearchObjects.NETWORK_CLUSTER_OBJ_NAME); + } buildCompletions(); } } diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerFactory.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerFactory.java index 59a0082..3f45cb5 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerFactory.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerFactory.java @@ -2,19 +2,25 @@ import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; +import org.ovirt.engine.core.common.mode.ApplicationMode; public class SyntaxCheckerFactory { private static String ConfigAuthenticationMethod; - private static final ISyntaxChecker uiSyntaxChecker = new SyntaxChecker(100, true); + private static ISyntaxChecker uiSyntaxChecker = null; private static ISyntaxChecker backendSyntaxChecker = null; private static final ISyntaxChecker adSyntaxChecker = new ADSyntaxChecker(); + private static ApplicationMode APPLICATION_MODE = ApplicationMode.AllModes; // This method is for used in client side by uicommon, which cannot access - // server side config, so needs to get the auth method as a parameter. + // server side config, so needs to get the auth method and application mode as parameters. - public static ISyntaxChecker CreateUISyntaxChecker(String AuthenticationMethod) { + public static ISyntaxChecker CreateUISyntaxChecker(String AuthenticationMethod, ApplicationMode applicationMode) { ConfigAuthenticationMethod = AuthenticationMethod; + APPLICATION_MODE = applicationMode; + if (uiSyntaxChecker == null) { + uiSyntaxChecker = new SyntaxChecker(100, true); + } return uiSyntaxChecker; } @@ -35,4 +41,8 @@ public static String getConfigAuthenticationMethod() { return ConfigAuthenticationMethod; } + + public static ApplicationMode getApplicationMode() { + return APPLICATION_MODE; + } } diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/UserCrossRefAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/UserCrossRefAutoCompleter.java index f2a6e3d..2222a65 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/UserCrossRefAutoCompleter.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/UserCrossRefAutoCompleter.java @@ -1,15 +1,23 @@ package org.ovirt.engine.core.searchbackend; +import org.ovirt.engine.core.common.mode.ApplicationModeUtil; + public class UserCrossRefAutoCompleter extends SearchObjectsBaseAutoCompleter { public UserCrossRefAutoCompleter() { - mVerbs.put(SearchObjects.VM_PLU_OBJ_NAME, SearchObjects.VM_PLU_OBJ_NAME); + if (ApplicationModeUtil.isVirtSupported(SyntaxCheckerFactory.getApplicationMode())) { + mVerbs.put(SearchObjects.VM_PLU_OBJ_NAME, SearchObjects.VM_PLU_OBJ_NAME); + mVerbs.put(SearchObjects.TEMPLATE_PLU_OBJ_NAME, SearchObjects.TEMPLATE_PLU_OBJ_NAME); + } mVerbs.put(SearchObjects.VDS_PLU_OBJ_NAME, SearchObjects.VDS_PLU_OBJ_NAME); - mVerbs.put(SearchObjects.TEMPLATE_PLU_OBJ_NAME, SearchObjects.TEMPLATE_PLU_OBJ_NAME); mVerbs.put(SearchObjects.AUDIT_PLU_OBJ_NAME, SearchObjects.AUDIT_PLU_OBJ_NAME); + buildCompletions(); - mVerbs.put(SearchObjects.VM_OBJ_NAME, SearchObjects.VM_OBJ_NAME); + + if (ApplicationModeUtil.isVirtSupported(SyntaxCheckerFactory.getApplicationMode())) { + mVerbs.put(SearchObjects.VM_OBJ_NAME, SearchObjects.VM_OBJ_NAME); + mVerbs.put(SearchObjects.TEMPLATE_OBJ_NAME, SearchObjects.TEMPLATE_OBJ_NAME); + } mVerbs.put(SearchObjects.VDS_OBJ_NAME, SearchObjects.VDS_OBJ_NAME); - mVerbs.put(SearchObjects.TEMPLATE_OBJ_NAME, SearchObjects.TEMPLATE_OBJ_NAME); mVerbs.put(SearchObjects.AUDIT_OBJ_NAME, SearchObjects.AUDIT_OBJ_NAME); } } diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VdsConditionFieldAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VdsConditionFieldAutoCompleter.java index 6f9f7fe..ad29709 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VdsConditionFieldAutoCompleter.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VdsConditionFieldAutoCompleter.java @@ -2,6 +2,7 @@ import org.ovirt.engine.core.common.businessentities.VDSNiceType; import org.ovirt.engine.core.common.businessentities.VDSStatus; +import org.ovirt.engine.core.common.mode.ApplicationModeUtil; public class VdsConditionFieldAutoCompleter extends BaseConditionFieldAutoCompleter { public VdsConditionFieldAutoCompleter() { @@ -13,20 +14,23 @@ mVerbs.put("CPU_USAGE", "CPU_USAGE"); mVerbs.put("MEM_USAGE", "MEM_USAGE"); mVerbs.put("NETWORK_USAGE", "NETWORK_USAGE"); - mVerbs.put("LOAD", "LOAD"); mVerbs.put("VERSION", "VERSION"); mVerbs.put("CPUS", "CPUS"); mVerbs.put("MEMORY", "MEMORY"); mVerbs.put("CPU_SPEED", "CPU_SPEED"); mVerbs.put("CPU_MODEL", "CPU_MODEL"); - mVerbs.put("ACTIVE_VMS", "ACTIVE_VMS"); - mVerbs.put("MIGRATING_VMS", "MIGRATING_VMS"); - mVerbs.put("COMMITTED_MEM", "COMMITTED_MEM"); + if (ApplicationModeUtil.isVirtSupported(SyntaxCheckerFactory.getApplicationMode())) { + mVerbs.put("LOAD", "LOAD"); + mVerbs.put("ACTIVE_VMS", "ACTIVE_VMS"); + mVerbs.put("MIGRATING_VMS", "MIGRATING_VMS"); + mVerbs.put("COMMITTED_MEM", "COMMITTED_MEM"); + mVerbs.put("TYPE", "TYPE"); + mVerbs.put("DATACENTER", "DATACENTER"); + } mVerbs.put("TAG", "TAG"); - mVerbs.put("TYPE", "TYPE"); - mVerbs.put("DATACENTER", "DATACENTER"); // mVerbs.Add("NOTE", "NOTE"); buildCompletions(); + // Building the types dict getTypeDictionary().put("NAME", String.class); getTypeDictionary().put("STATUS", VDSStatus.class); diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VdsCrossRefAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VdsCrossRefAutoCompleter.java index db57d46..15b52ee 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VdsCrossRefAutoCompleter.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VdsCrossRefAutoCompleter.java @@ -1,16 +1,24 @@ package org.ovirt.engine.core.searchbackend; +import org.ovirt.engine.core.common.mode.ApplicationModeUtil; + public class VdsCrossRefAutoCompleter extends SearchObjectsBaseAutoCompleter { public VdsCrossRefAutoCompleter() { - mVerbs.put(SearchObjects.VM_PLU_OBJ_NAME, SearchObjects.VM_PLU_OBJ_NAME); - mVerbs.put(SearchObjects.TEMPLATE_PLU_OBJ_NAME, SearchObjects.TEMPLATE_PLU_OBJ_NAME); + if (ApplicationModeUtil.isVirtSupported(SyntaxCheckerFactory.getApplicationMode())) { + mVerbs.put(SearchObjects.VM_PLU_OBJ_NAME, SearchObjects.VM_PLU_OBJ_NAME); + mVerbs.put(SearchObjects.TEMPLATE_PLU_OBJ_NAME, SearchObjects.TEMPLATE_PLU_OBJ_NAME); + mVerbs.put(SearchObjects.VDC_STORAGE_DOMAIN_OBJ_NAME, SearchObjects.VDC_STORAGE_DOMAIN_OBJ_NAME); + } mVerbs.put(SearchObjects.AUDIT_PLU_OBJ_NAME, SearchObjects.AUDIT_PLU_OBJ_NAME); mVerbs.put(SearchObjects.VDC_USER_PLU_OBJ_NAME, SearchObjects.VDC_USER_PLU_OBJ_NAME); - mVerbs.put(SearchObjects.VDC_STORAGE_DOMAIN_OBJ_NAME, SearchObjects.VDC_STORAGE_DOMAIN_OBJ_NAME); mVerbs.put(SearchObjects.VDS_NETWORK_INTERFACE_OBJ_NAME, SearchObjects.VDS_NETWORK_INTERFACE_OBJ_NAME); + buildCompletions(); - mVerbs.put(SearchObjects.VM_OBJ_NAME, SearchObjects.VM_OBJ_NAME); - mVerbs.put(SearchObjects.TEMPLATE_OBJ_NAME, SearchObjects.TEMPLATE_OBJ_NAME); + + if (ApplicationModeUtil.isVirtSupported(SyntaxCheckerFactory.getApplicationMode())) { + mVerbs.put(SearchObjects.VM_OBJ_NAME, SearchObjects.VM_OBJ_NAME); + mVerbs.put(SearchObjects.TEMPLATE_OBJ_NAME, SearchObjects.TEMPLATE_OBJ_NAME); + } mVerbs.put(SearchObjects.AUDIT_OBJ_NAME, SearchObjects.AUDIT_OBJ_NAME); mVerbs.put(SearchObjects.VDC_USER_OBJ_NAME, SearchObjects.VDC_USER_OBJ_NAME); } diff --git a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerFactoryTest.java b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerFactoryTest.java index 1275ae6..1b61834 100644 --- a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerFactoryTest.java +++ b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerFactoryTest.java @@ -9,14 +9,15 @@ import org.ovirt.engine.core.common.config.ConfigCommon; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.config.IConfigUtilsInterface; +import org.ovirt.engine.core.common.mode.ApplicationMode; public class SyntaxCheckerFactoryTest { @Test public void CreateUISyntaxChecker() { - ISyntaxChecker checker = SyntaxCheckerFactory.CreateUISyntaxChecker("foo"); + ISyntaxChecker checker = SyntaxCheckerFactory.CreateUISyntaxChecker("foo", ApplicationMode.AllModes); Assert.assertNotNull(checker); - Assert.assertEquals(checker, SyntaxCheckerFactory.CreateUISyntaxChecker("foo")); + Assert.assertEquals(checker, SyntaxCheckerFactory.CreateUISyntaxChecker("foo", ApplicationMode.AllModes)); Assert.assertEquals("foo", SyntaxCheckerFactory.getConfigAuthenticationMethod()); } diff --git a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml index 4ff9396..f94d180 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml +++ b/frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml @@ -270,6 +270,7 @@ <include name="common/VdcEventNotificationUtils.java" /> <include name="common/EventNotificationEntity.java" /> <include name="common/mode/ApplicationMode.java" /> + <include name="common/mode/ApplicationModeUtil.java" /> <include name="common/interfaces/ITagsHandler.java" /> <!-- UiCommon --> <include name="common/VdcActionUtils.java" /> diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/autocomplete/SearchSuggestModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/autocomplete/SearchSuggestModel.java index 8b91ea0..43d516c 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/autocomplete/SearchSuggestModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/autocomplete/SearchSuggestModel.java @@ -12,6 +12,7 @@ import org.ovirt.engine.core.searchbackend.SyntaxError; import org.ovirt.engine.core.searchbackend.SyntaxObjectType; import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; +import org.ovirt.engine.ui.uicommonweb.models.ApplicationModeHelper; import org.ovirt.engine.ui.uicommonweb.models.SearchableListModel; import org.ovirt.engine.ui.uicompat.ITaskTarget; import org.ovirt.engine.ui.uicompat.ObservableCollection; @@ -78,7 +79,8 @@ syntaxChecker = SyntaxCheckerFactory.CreateUISyntaxChecker((String) - AsyncDataProvider.GetConfigValuePreConverted(ConfigurationValues.AuthenticationMethod)); + AsyncDataProvider.GetConfigValuePreConverted(ConfigurationValues.AuthenticationMethod), + ApplicationModeHelper.getUiMode()); setIsTimerDisabled(true); } -- To view, visit http://gerrit.ovirt.org/13704 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia2e9293bb26616a170a3edcc2184cce748cbc9c0 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Kanagaraj M <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
