IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

datasource: fix merge conflict - restore dashboards tab

Browse Source
This commit is contained in:
Daniel Lee
2017-11-27 15:17:50 +01:00
parent 7f3a3b9e55
commit 07cd182617
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/plugins/ds_edit_ctrl.ts
View File

@@ -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;
});
}

7
public/app/features/plugins/partials/ds_edit.html
View File

@@ -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>