From 07cd182617ae4c6e09afcc9d1a1364df26e1e13d Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Mon, 27 Nov 2017 15:17:50 +0100
Subject: [PATCH] datasource: fix merge conflict - restore dashboards tab

---
 public/app/features/plugins/ds_edit_ctrl.ts       | 2 +-
 public/app/features/plugins/partials/ds_edit.html | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/public/app/features/plugins/ds_edit_ctrl.ts b/public/app/features/plugins/ds_edit_ctrl.ts
index db0d5c744dc..6ea230e054b 100644
--- a/public/app/features/plugins/ds_edit_ctrl.ts
+++ b/public/app/features/plugins/ds_edit_ctrl.ts
@@ -114,7 +114,7 @@ export class DataSourceEditCtrl {
     this.hasDashboards = false;
     return this.backendSrv.get('/api/plugins/' + this.current.type + '/settings').then(pluginInfo => {
       this.datasourceMeta = pluginInfo;
-      this.hasDashboards = _.find(pluginInfo.includes, {type: 'dashboard'});
+      this.hasDashboards = _.find(pluginInfo.includes, {type: 'dashboard'}) !== undefined;
     });
   }
 
diff --git a/public/app/features/plugins/partials/ds_edit.html b/public/app/features/plugins/partials/ds_edit.html
index 58396e816b3..4d6a091ca95 100644
--- a/public/app/features/plugins/partials/ds_edit.html
+++ b/public/app/features/plugins/partials/ds_edit.html
@@ -83,6 +83,9 @@
 				<br />
 
 			</form>
-		</div>
-	</div>
+    </div>
+    <div ng-if="ctrl.tabIndex === 1" class="tab-content">
+      <dashboard-import-list plugin="ctrl.datasourceMeta" datasource="ctrl.current"></dashboard-import-list>
+    </div>
+  </div>
 </div>