Merge branch 'master' into 7883_new_url_structure

This commit is contained in:
Marcus Efraimsson
2018-02-01 17:32:43 +01:00
37 changed files with 1196 additions and 378 deletions

View File

@@ -1,5 +1,6 @@
import angular from 'angular';
import locationUtil from 'app/core/utils/location_util';
import appEvents from 'app/core/app_events';
export class SoloPanelCtrl {
/** @ngInject */
@@ -8,6 +9,7 @@ export class SoloPanelCtrl {
$scope.init = function() {
contextSrv.sidemenu = false;
appEvents.emit('toggle-sidemenu');
var params = $location.search();
panelId = parseInt(params.panelId);