소스 검색

Merge branch 'fix-remove-share' of oscarleiva/energylink into development

Se fusiona 'fix-remove-share' con 'development'
Oscar Alfredo Leiva Salomón 6 년 전
부모
커밋
732eb9a2bb
2개의 변경된 파일14개의 추가작업 그리고 10개의 파일을 삭제
  1. 2 0
      public/app/features/dashboard/components/DashNav/DashNav.tsx
  2. 12 10
      public/app/features/panel/panel_ctrl.ts

+ 2 - 0
public/app/features/dashboard/components/DashNav/DashNav.tsx

@@ -220,6 +220,7 @@ export class DashNav extends PureComponent<Props> {
             />
           )}
 
+          {/* Se elimina el boton Share de los dashboards - Oscar Leiva 03/12/2019
           {canShare && (
             <DashNavButton
               tooltip="Share dashboard"
@@ -228,6 +229,7 @@ export class DashNav extends PureComponent<Props> {
               onClick={this.onOpenShare}
             />
           )}
+          */}
 
           {canSave && (
             <DashNavButton tooltip="Save dashboard" classSuffix="save" icon="fa fa-save" onClick={this.onSave} />

+ 12 - 10
public/app/features/panel/panel_ctrl.ts

@@ -139,12 +139,13 @@ export class PanelCtrl {
       });
     }
 
-    menu.push({
-      text: 'Share',
-      click: 'ctrl.sharePanel();',
-      icon: 'fa fa-fw fa-share',
-      shortcut: 'p s',
-    });
+    // se elimina la opción Share del menu dropdown - Oscar Leiva 03/12/2019
+    // menu.push({
+    //   text: 'Share',
+    //   click: 'ctrl.sharePanel();',
+    //   icon: 'fa fa-fw fa-share',
+    //   shortcut: 'p s',
+    // });
 
     // Additional items from sub-class
     menu.push(...(await this.getAdditionalMenuItems()));
@@ -188,10 +189,11 @@ export class PanelCtrl {
       });
     }
 
-    menu.push({
-      text: 'Panel JSON',
-      click: 'ctrl.editPanelJson(); dismiss();',
-    });
+    // se elimina el elemento 'Panel Json' del dropdown - Oscar leiva 03/12/2019
+    // menu.push({
+    //   text: 'Panel JSON',
+    //   click: 'ctrl.editPanelJson(); dismiss();',
+    // });
 
     this.events.emit('init-panel-actions', menu);
     return menu;