Repository: incubator-atlas
Updated Branches:
  refs/heads/master 2cae42c08 -> 125cdf5af


ATLAS-395 UI : In details page maps not displayed for different data 
models(darshankuma89 via sumasai)


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

Branch: refs/heads/master
Commit: 125cdf5af9d34eaf8ada5f1b8d7fd587da483ecb
Parents: 2cae42c
Author: Suma Shivaprasad <[email protected]>
Authored: Sat Dec 19 08:46:46 2015 +0530
Committer: Suma Shivaprasad <[email protected]>
Committed: Sat Dec 19 08:46:46 2015 +0530

----------------------------------------------------------------------
 .../public/modules/details/views/details.html   | 22 +++++++++++++++++++-
 release-log.txt                                 |  3 ++-
 2 files changed, 23 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/125cdf5a/dashboard/public/modules/details/views/details.html
----------------------------------------------------------------------
diff --git a/dashboard/public/modules/details/views/details.html 
b/dashboard/public/modules/details/views/details.html
index c84aeb2..37fcaad 100644
--- a/dashboard/public/modules/details/views/details.html
+++ b/dashboard/public/modules/details/views/details.html
@@ -50,7 +50,27 @@
                             </td>
                             <td data-ng-if="isObject(value) && 
isObject(value.id) && isString(value.id.id)" class="pointer">  <a 
data-ui-sref="details({id:value.id.id})">{{ value.id.id }}</a>
                             </td>
-                            <td data-ng-if="isArray(value)">
+                           <td data-ng-if="isObject(value) && !isArray(value) 
&& !isString(value.id) && !isObject(value.id)">
+                                <span data-ng-repeat="(key2, value2) in 
value"> {{ key2 }} : {{ value2 }}<span ng-if="!$last">,</span></span>
+                            </td>
+                             <td data-ng-if="isArray(value) && 
!isString(value.id) && !isObject(value.id)">
+                                <div  data-ng-repeat="(key2, value2) in value">
+                                <a class=" pointer" 
data-ng-if="isObject(value2) && isString(value2.id)"   
data-ui-sref="details({id:value2.id})">{{ value2.id }}</a>
+                              
+                                    <div class="row pdLft15px" 
data-ng-repeat="(key1, value1) in value2">
+                                  
+                                    <span ng-if="isObject(value1)">
+                                        <a class=" pointer" 
data-ng-if="isString(value1.id)"   data-ui-sref="details({id:value1.id})">{{ 
value1.id }}</a>
+                                       
+                                        
+                                    </span> 
+                                   
+                                       
+                                        
+                                    </div>
+                                </div>
+                            </td>
+                            <td data-ng-if="isArray(value) && 
!isObject(value)" >
                                 <div class="row" data-ng-repeat="(key1, 
value1) in value" ng-if="value1">
                                     <div data-ng-if="isObject(value1)" 
data-ng-repeat="(key2, value2) in value1" > 
                                         <a data-ng-if="isString(value2) && 
key2 == 'id'" class="pointer pdLft15px" data-ui-sref="details({id:value2})">{{ 
value2 }}</a> 

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/125cdf5a/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 0588ff9..7c7cff4 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -12,8 +12,10 @@ 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)
+ATLAS-47 Entity mutations for complex types (sumasai via shwethags)
 
 ALL CHANGES:
+ATLAS-395 UI : In details page maps not displayed for different data models 
(darshankumar89 via sumasai)
 ATLAS-394 Fix BaseResourceIT.waitForNotification (shwethags via sumasai)
 ATLAS-385 Support for Lineage for entities with SuperType as DataSet (anilsg 
via sumasai)
 ATLAS-342 Atlas is sending an ENTITY_CREATE event to the ATLAS_ENTITIES topic 
even if the entity exists already (shwethags)
@@ -25,7 +27,6 @@ ATLAS-244 UI: Add Tag Tab (darshankumar89 via sumasai)
 ATLAS-376 UI: Use the Schema API of the backend to populate details for Schema 
tab (darshankumar89 via sumasai)
 ATLAS-380 Fix ATLAS source artifact generation (sumasai)
 ATLAS-354 Kerberized cluster: quick_start.py fails to add sample data 
(shwethags)
-ATLAS-47 Entity mutations for complex types (sumasai via shwethags)
 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)

Reply via email to