Skip to content

N
nexpie-grafana-theme
Commit 07cd1826 by Daniel Lee
Options

datasource: fix merge conflict - restore dashboards tab

parent 7f3a3b9e
Showing with 6 additions and 3 deletions
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;
});
}
......
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>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment