From c2417670d14acc491a2e98d0230c737014f7def3 Mon Sep 17 00:00:00 2001 From: Andrea Campanella Date: Thu, 2 Feb 2017 11:29:59 -0800 Subject: [PATCH] Fix for alarm device panel not showing up, removing esc hook in alarm overlay Change-Id: Idcf46c8782b88edfdec1560aca60d05d3d040aa1 --- .../faultmanagement/alarms/gui/AlarmTopovOverlay.java | 4 +--- .../main/resources/app/view/alarmTopov/alarmTopovOverlay.js | 6 ------ 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/apps/faultmanagement/fmgui/src/main/java/org/onosproject/faultmanagement/alarms/gui/AlarmTopovOverlay.java b/apps/faultmanagement/fmgui/src/main/java/org/onosproject/faultmanagement/alarms/gui/AlarmTopovOverlay.java index 509403027c..5f04dbebef 100644 --- a/apps/faultmanagement/fmgui/src/main/java/org/onosproject/faultmanagement/alarms/gui/AlarmTopovOverlay.java +++ b/apps/faultmanagement/fmgui/src/main/java/org/onosproject/faultmanagement/alarms/gui/AlarmTopovOverlay.java @@ -33,7 +33,6 @@ public class AlarmTopovOverlay extends UiTopoOverlay { private static final String OVERLAY_ID = "alarmsTopo-overlay"; private static final ButtonId ALARM1_BUTTON = new ButtonId("alarm1button"); - private static final ButtonId ALARM2_BUTTON = new ButtonId("alarm2button"); public AlarmTopovOverlay() { super(OVERLAY_ID); @@ -58,8 +57,7 @@ public class AlarmTopovOverlay extends UiTopoOverlay { Map countsForDevice = AlarmServiceUtil.lookUpAlarmCounts(deviceId); addAlarmCountsProperties(pp, countsForDevice); - pp.addButton(ALARM1_BUTTON) - .addButton(ALARM2_BUTTON); + pp.addButton(ALARM1_BUTTON); pp.removeButtons(CoreButtons.SHOW_PORT_VIEW) .removeButtons(CoreButtons.SHOW_GROUP_VIEW) diff --git a/apps/faultmanagement/fmgui/src/main/resources/app/view/alarmTopov/alarmTopovOverlay.js b/apps/faultmanagement/fmgui/src/main/resources/app/view/alarmTopov/alarmTopovOverlay.js index a63f476dc4..0c5b380ef0 100644 --- a/apps/faultmanagement/fmgui/src/main/resources/app/view/alarmTopov/alarmTopovOverlay.js +++ b/apps/faultmanagement/fmgui/src/main/resources/app/view/alarmTopov/alarmTopovOverlay.js @@ -103,12 +103,6 @@ } }, hooks: { - // hook for handling escape key - // Must return true to consume ESC, false otherwise. - escape: function () { - // Must return true to consume ESC, false otherwise. - return atds.stopDisplay(); - }, // hooks for when the selection changes... empty: function () { selectionCallback('empty');