You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by sh...@apache.org on 2015/12/08 06:15:48 UTC
incubator-atlas git commit: ATLAS-345 UI: Should allow tag addition
on any search result that returns a reference-able entity (darshankumar89 via
shwethags)
Repository: incubator-atlas
Updated Branches:
refs/heads/master cc2d88602 -> 6c3f0964b
ATLAS-345 UI: Should allow tag addition on any search result that returns a reference-able entity (darshankumar89 via shwethags)
Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/6c3f0964
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/6c3f0964
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/6c3f0964
Branch: refs/heads/master
Commit: 6c3f0964b039d60517c6aa2ea90ab0583e0f28c2
Parents: cc2d886
Author: Shwetha GS <ss...@hortonworks.com>
Authored: Tue Dec 8 10:45:42 2015 +0530
Committer: Shwetha GS <ss...@hortonworks.com>
Committed: Tue Dec 8 10:45:42 2015 +0530
----------------------------------------------------------------------
dashboard/public/modules/search/searchController.js | 13 ++++++++-----
dashboard/public/modules/search/views/search.html | 2 +-
release-log.txt | 6 ++++++
3 files changed, 15 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/6c3f0964/dashboard/public/modules/search/searchController.js
----------------------------------------------------------------------
diff --git a/dashboard/public/modules/search/searchController.js b/dashboard/public/modules/search/searchController.js
index 4e4dde7..103c274 100644
--- a/dashboard/public/modules/search/searchController.js
+++ b/dashboard/public/modules/search/searchController.js
@@ -133,7 +133,8 @@ angular.module('dgc.search').controller('SearchController', ['$scope', '$locatio
angular.forEach($scope.resultRows, function(value) {
var objVal = {},
curVal = value,
- onlyId = false;
+ onlyId = false,
+ traits = false;
if (curVal.name) {
objVal.name = curVal.name;
@@ -144,10 +145,7 @@ angular.module('dgc.search').controller('SearchController', ['$scope', '$locatio
if (ky === '$id$') {
objVal.id = curVal[ky].id;
onlyId = true;
- } else if (ky === '$traits$') {
- objVal[ky] = vl;
- objVal.Tools = objVal.id;
- onlyId = false;
+ traits = true;
} else if (ky.indexOf('$') === -1) {
objVal[ky] = vl;
onlyId = false;
@@ -155,6 +153,11 @@ angular.module('dgc.search').controller('SearchController', ['$scope', '$locatio
}
});
+ if (traits) {
+ objVal.$traits$ = curVal.$traits$ || {};
+ objVal.Tools = objVal.id;
+ }
+
if (onlyId) {
objVal.guid = objVal.id;
}
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/6c3f0964/dashboard/public/modules/search/views/search.html
----------------------------------------------------------------------
diff --git a/dashboard/public/modules/search/views/search.html b/dashboard/public/modules/search/views/search.html
index b905cb9..594d790 100644
--- a/dashboard/public/modules/search/views/search.html
+++ b/dashboard/public/modules/search/views/search.html
@@ -68,7 +68,7 @@
</span>
</td>
<td>
- <div id="{{result['$id$'].id}}" ng-show="!dataTransitioned" class="wordBreak"><a class="tabsearchanchor" ng-repeat="(key, value) in result['$traits$']" data-ui-sref="search({query: key})" title="{{key}}">{{key}}<span> </span></a></div>
+ <div id="{{result['$id$'].id || result.guid}}" ng-show="!dataTransitioned" class="wordBreak"><a class="tabsearchanchor" ng-repeat="(key, value) in result['$traits$']" data-ui-sref="search({query: key})" title="{{key}}">{{key}}<span> </span></a></div>
</td>
<td class="addTag"><img ng-src="img/addTag.png" tooltip="Add Tag" ng-click="openAddTagHome(result['$id$'].id || result.guid)"></td>
</tr>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/6c3f0964/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 979bdf2..4ebba32 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -2,13 +2,19 @@ Apache Atlas Release Notes
==========================
--trunk - unreleased
+INCOMPATIBLE CHANGES:
+
+ALL CHANGES:
+
+--Release 0.6-incubating
INCOMPATIBLE CHANGES:
ATLAS-58 Make hive hook reliable (shwethags)
ATLAS-54 Rename configs in hive hook (shwethags)
ATLAS-3 Mixed Index creation fails with Date types (sumasai via shwethags)
ALL CHANGES:
+ATLAS-345 UI: Should allow tag addition on any search result that returns a reference-able entity (darshankumar89 via shwethags)
ATLAS-279 UI not displaying results for certain successful "select" search queries (anilsg via shwethags)
ATLAS-242 The qualified name for hive entities should be backward compatible (shwethags)
ATLAS-361 Add validation when index backends are switched in ATLAS configuration (sumasai via shwethags)