Repository: atlas
Updated Branches:
  refs/heads/master 3f2d19150 -> fb28760a3


ATLAS-2027 : UI : Add type-name with attribute name in query-builder

Signed-off-by: nixonrodrigues <ni...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/1298c83d
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/1298c83d
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/1298c83d

Branch: refs/heads/master
Commit: 1298c83deba4269d4cf9fb9c525d4987f10d7fa3
Parents: 3f2d191
Author: kevalbhatt <kbh...@apache.org>
Authored: Tue Aug 8 16:57:52 2017 +0530
Committer: nixonrodrigues <ni...@apache.org>
Committed: Wed Aug 9 13:55:26 2017 +0530

----------------------------------------------------------------------
 dashboardv2/public/js/views/search/QueryBuilderView.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/atlas/blob/1298c83d/dashboardv2/public/js/views/search/QueryBuilderView.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/views/search/QueryBuilderView.js 
b/dashboardv2/public/js/views/search/QueryBuilderView.js
index 6cdbeb3..ebef684 100644
--- a/dashboardv2/public/js/views/search/QueryBuilderView.js
+++ b/dashboardv2/public/js/views/search/QueryBuilderView.js
@@ -81,7 +81,7 @@ define(['require',
             getObjDef: function(attrObj, rules) {
                 var obj = {
                     id: attrObj.name,
-                    label: attrObj.name.capitalize(),
+                    label: attrObj.name.capitalize() + " (" + attrObj.typeName 
+ ")",
                     type: attrObj.typeName
                 };
                 if (obj.type === "date") {
@@ -104,17 +104,17 @@ define(['require',
                     return obj;
                 }
                 if (this.isPrimitive(obj.type)) {
+                    if (obj.type === "boolean") {
+                        obj['input'] = 'select';
+                        obj['values'] = ['true', 'false'];
+                    }
+                    _.extend(obj, this.getOperator(obj.type));
                     if (obj.type === "long" || obj.type === "float") {
                         obj.type = "double";
                     }
                     if (obj.type === "int" || obj.type === "byte" || obj.type 
=== "short") {
                         obj.type = "integer";
                     }
-                    if (obj.type === "boolean") {
-                        obj['input'] = 'select';
-                        obj['values'] = ['true', 'false'];
-                    }
-                    _.extend(obj, this.getOperator(obj.type));
                     return obj;
                 }
                 var enumObj = this.enumDefCollection.fullCollection.find({ 
name: obj.type });

Reply via email to