Commit 08f7e55a by Torkel Ödegaard

Moved dashboard settings to components

parent dfe9252f
import { coreModule, appEvents, contextSrv } from 'app/core/core'; import { coreModule, appEvents, contextSrv } from 'app/core/core';
import { DashboardModel } from '../dashboard_model'; import { DashboardModel } from '../../dashboard_model';
import $ from 'jquery'; import $ from 'jquery';
import _ from 'lodash'; import _ from 'lodash';
import angular from 'angular'; import angular from 'angular';
...@@ -230,7 +230,7 @@ export class SettingsCtrl { ...@@ -230,7 +230,7 @@ export class SettingsCtrl {
export function dashboardSettings() { export function dashboardSettings() {
return { return {
restrict: 'E', restrict: 'E',
templateUrl: 'public/app/features/dashboard/settings/settings.html', templateUrl: 'public/app/features/dashboard/components/DashboardSettings/template.html',
controller: SettingsCtrl, controller: SettingsCtrl,
bindToController: true, bindToController: true,
controllerAs: 'ctrl', controllerAs: 'ctrl',
......
export { SettingsCtrl } from './SettingsCtrl';
...@@ -19,7 +19,6 @@ import './ad_hoc_filters'; ...@@ -19,7 +19,6 @@ import './ad_hoc_filters';
import './repeat_option/repeat_option'; import './repeat_option/repeat_option';
import './dashgrid/DashboardGridDirective'; import './dashgrid/DashboardGridDirective';
import './dashgrid/RowOptions'; import './dashgrid/RowOptions';
import './settings/settings';
import './panellinks/module'; import './panellinks/module';
import './components/DashLinks'; import './components/DashLinks';
import './components/DashExportModal'; import './components/DashExportModal';
...@@ -27,6 +26,7 @@ import './components/DashNav'; ...@@ -27,6 +26,7 @@ import './components/DashNav';
import './components/ExportDataModal'; import './components/ExportDataModal';
import './components/FolderPicker'; import './components/FolderPicker';
import './components/VersionHistory'; import './components/VersionHistory';
import './components/DashboardSettings';
import DashboardPermissions from './components/DashboardPermissions/DashboardPermissions'; import DashboardPermissions from './components/DashboardPermissions/DashboardPermissions';
// angular wrappers // angular wrappers
......
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