[Engine-patches] Change in ovirt-engine[master]: core: Search templates by version name only

[smelamud]

Hello Shmuel Melamud,

I'd like you to do a code review.  Please visit

    https://gerrit.ovirt.org/41884

to review the following change.

Change subject: core: Search templates by version name only
......................................................................

core: Search templates by version name only

Specifying two fields in BaseConditionFieldAutoCompleter.columnNameDict
is not supported. Using only template_version_name for search fixes SQL
syntax error and incorrect sorting.

Change-Id: I074cb7ebf2a61a762ce7bc95323b400446ad2a2b
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1225428
Signed-off-by: Shmuel Melamud <smela...@redhat.com>
---
M 
backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VmTemplateConditionFieldAutoCompleter.java
M 
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabTemplateView.java
2 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/84/41884/1

diff --git 
a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VmTemplateConditionFieldAutoCompleter.java
 
b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VmTemplateConditionFieldAutoCompleter.java
index 8cf9aa8..9aa0908 100644
--- 
a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VmTemplateConditionFieldAutoCompleter.java
+++ 
b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VmTemplateConditionFieldAutoCompleter.java
@@ -23,7 +23,7 @@
     public static final String QUOTA = "QUOTA";
     public static final String ARCHITECTURE = "ARCHITECTURE";
     public static final String VMT_ID = "_VMT_ID";
-    public static final String VERSION_NAME_AND_NUMBER = 
"VERSION_NAME_AND_NUMBER";
+    public static final String VERSION_NAME = "VERSION_NAME";
 
     public VmTemplateConditionFieldAutoCompleter() {
         mVerbs.add(NAME);
@@ -38,7 +38,7 @@
         mVerbs.add(DATACENTER);
         mVerbs.add(QUOTA);
         mVerbs.add(ARCHITECTURE);
-        mVerbs.add(VERSION_NAME_AND_NUMBER);
+        mVerbs.add(VERSION_NAME);
 
         buildCompletions();
         mVerbs.add(VMT_ID);
@@ -57,7 +57,7 @@
         getTypeDictionary().put(VMT_ID, UUID.class);
         getTypeDictionary().put(DESCRIPTION, String.class);
         getTypeDictionary().put(ARCHITECTURE, ArchitectureType.class);
-        getTypeDictionary().put(VERSION_NAME_AND_NUMBER, String.class);
+        getTypeDictionary().put(VERSION_NAME, String.class);
 
         // building the ColumnName Dict
         columnNameDict.put(NAME, "name");
@@ -74,7 +74,7 @@
         columnNameDict.put(VMT_ID, "vmt_guid");
         columnNameDict.put(DESCRIPTION, "description");
         columnNameDict.put(ARCHITECTURE, "architecture");
-        columnNameDict.put(VERSION_NAME_AND_NUMBER, "template_version_name, 
template_version_number");
+        columnNameDict.put(VERSION_NAME, "template_version_name");
 
         notFreeTextSearchableFieldsList.add(OS);
         // Building the validation dict
diff --git 
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabTemplateView.java
 
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabTemplateView.java
index fcb381e..6ca6f0c 100644
--- 
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabTemplateView.java
+++ 
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabTemplateView.java
@@ -64,7 +64,7 @@
                         object.getTemplateVersionNumber());
             }
         };
-        
versionNameColumn.makeSortable(VmTemplateConditionFieldAutoCompleter.VERSION_NAME_AND_NUMBER);
+        
versionNameColumn.makeSortable(VmTemplateConditionFieldAutoCompleter.VERSION_NAME);
         getTable().addColumn(versionNameColumn, constants.versionTemplate(), 
"150px"); //$NON-NLS-1$
 
         CommentColumn<VmTemplate> commentColumn = new 
CommentColumn<VmTemplate>();


-- 
To view, visit https://gerrit.ovirt.org/41884
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I074cb7ebf2a61a762ce7bc95323b400446ad2a2b
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Shmuel Leib Melamud <smela...@redhat.com>
Gerrit-Reviewer: Shmuel Melamud <smela...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches