فهرست منبع

wip: panel-header: Fix shareModal compatibility with react and angular

Johannes Schill 7 سال پیش
والد
کامیت
08251425ca
1فایلهای تغییر یافته به همراه2 افزوده شده و 2 حذف شده
  1. 2 2
      public/app/features/dashboard/shareModalCtrl.ts

+ 2 - 2
public/app/features/dashboard/shareModalCtrl.ts

@@ -12,8 +12,8 @@ export function ShareModalCtrl($scope, $rootScope, $location, $timeout, timeSrv,
   $scope.editor = { index: $scope.tabIndex || 0 };
   $scope.editor = { index: $scope.tabIndex || 0 };
 
 
   $scope.init = () => {
   $scope.init = () => {
-    $scope.panel = $scope.model.panel || $scope.panel; // React pass panel and dashboard in the "model" property
-    $scope.dashboard = $scope.model.dashboard || $scope.dashboard;
+    $scope.panel = $scope.model && $scope.model.panel ? $scope.model.panel : $scope.panel; // React pass panel and dashboard in the "model" property
+    $scope.dashboard = $scope.model && $scope.model.dashboard ? $scope.model.dashboard : $scope.dashboard; // ^
     $scope.modeSharePanel = $scope.panel ? true : false;
     $scope.modeSharePanel = $scope.panel ? true : false;
 
 
     $scope.tabs = [{ title: 'Link', src: 'shareLink.html' }];
     $scope.tabs = [{ title: 'Link', src: 'shareLink.html' }];