Repository: atlas
Updated Branches:
  refs/heads/branch-1.0 b9c146b72 -> e7b7de0fa


ATLAS-3018 : UI - classification search table shows then Basic search text with 
loader which is incorrect

(cherry picked from commit 4003858919bfff58d55479cbb2f2a79b5f4e9826)


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

Branch: refs/heads/branch-1.0
Commit: e7b7de0fa6de94bb96f1a5c7325caadb40347269
Parents: b9c146b
Author: kevalbhatt <kbh...@apache.org>
Authored: Fri Jan 4 11:29:10 2019 +0530
Committer: nixonrodrigues <ni...@apache.org>
Committed: Tue Jan 8 17:51:17 2019 +0530

----------------------------------------------------------------------
 .../public/js/templates/search/SearchResultLayoutView_tmpl.html   | 3 ++-
 dashboardv2/public/js/views/search/SearchResultLayoutView.js      | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/atlas/blob/e7b7de0f/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html
----------------------------------------------------------------------
diff --git 
a/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html 
b/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html
index 6675664..b10a0b8 100644
--- a/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html
+++ b/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html
@@ -53,7 +53,8 @@
                 </div>
             </div>
             <div id="r_searchResultTableLayoutView">
-                <h1><b>{{searchType}}</b></h1> {{#if entityCreate}}
+                {{#if isSearchTab}}<h1><b>{{searchType}}</b></h1>{{/if}}
+                {{#if entityCreate}}
                 <div class="entityLink" style="display:none">
                     <p class="entityLink">Search Atlas for existing entities or
                         <a href="javascript:void(0)" data-id='createEntity'> 
create new entity </a>

http://git-wip-us.apache.org/repos/asf/atlas/blob/e7b7de0f/dashboardv2/public/js/views/search/SearchResultLayoutView.js
----------------------------------------------------------------------
diff --git a/dashboardv2/public/js/views/search/SearchResultLayoutView.js 
b/dashboardv2/public/js/views/search/SearchResultLayoutView.js
index 38a5de8..83e88f2 100644
--- a/dashboardv2/public/js/views/search/SearchResultLayoutView.js
+++ b/dashboardv2/public/js/views/search/SearchResultLayoutView.js
@@ -75,7 +75,8 @@ define(['require',
                 return {
                     entityCreate: Globals.entityCreate,
                     searchType: this.searchType,
-                    fromView: this.fromView
+                    fromView: this.fromView,
+                    isSearchTab: Utils.getUrlState.isSearchTab()
                 };
             },
             /** ui events hash */

Reply via email to