fix(outages): do not pop up outages when not supported (COMPASS-42)

OpenNMS · May 14, 2015 · 37220be · 37220be
1 parent 37fb6fb
commit 37220be
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 6 deletions.
diff --git a/scss/includes/outage-list.scss b/scss/includes/outage-list.scss
@@ -1,4 +1,8 @@
 .outage-list {
+	.error {
+		color: red;
+	}
+
 	.item {
 		border-top: 0;
 		border-bottom: 0;

diff --git a/www/css/opennms.css b/www/css/opennms.css
@@ -15,7 +15,7 @@
 @font-face {
   font-family: "Ionicons";
   src: url("../lib/ionic/release/fonts/ionicons.eot?v=2.0.1");
-  src: url("../lib/ionic/release/fonts/ionicons.eot?v=2.0.1#iefix") format("embedded-opentype"), url("../lib/ionic/release/fonts/ionicons.ttf?v=2.0.1") format("truetype"), url("../lib/ionic/release/fonts/ionicons.woff?v=2.0.1") format("woff"), url("../lib/ionic/release/fonts/ionicons.svg?v=2.0.1#Ionicons") format("svg");
+  src: url("../lib/ionic/release/fonts/ionicons.eot?v=2.0.1#iefix") format("embedded-opentype"), url("../lib/ionic/release/fonts/ionicons.ttf?v=2.0.1") format("truetype"), url("../lib/ionic/release/fonts/ionicons.woff?v=2.0.1") format("woff"), url("../lib/ionic/release/fonts/ionicons.woff") format("woff"), url("../lib/ionic/release/fonts/ionicons.svg?v=2.0.1#Ionicons") format("svg");
   font-weight: normal;
   font-style: normal; }
 
@@ -2578,7 +2578,7 @@ body.grade-b, body.grade-c {
   width: auto;
   height: auto; }
 
-.scroll-content-false, .menu .scroll-content.scroll-content-false {
+.menu .scroll-content.scroll-content-false {
   z-index: 11; }
 
 .scroll-view {
@@ -8090,6 +8090,8 @@ a.button {
 .node-detail .row {
   font-size: 90%; }
 
+.outage-list .error {
+  color: red; }
 .outage-list .item {
   border-top: 0;
   border-bottom: 0; }

diff --git a/www/css/opennms.min.css b/www/css/opennms.min.css
diff --git a/www/scripts/opennms/services/Modals.js b/www/scripts/opennms/services/Modals.js
@@ -252,7 +252,8 @@
 			};
 
 			modal.scope.refreshOutages = function() {
-				OutageService.summaries().then(function(outages) {
+				var promise = OutageService.summaries();
+				promise.then(function(outages) {
 					var oldOutages = byId(modal.scope.outages);
 					var oldOutage;
 					for (var i=0; i < outages.length; i++) {
@@ -270,6 +271,7 @@
 					modal.scope.outages = [];
 					modal.scope.$broadcast('scroll.refreshComplete');
 				});
+				return promise;
 			};
 
 			var startRefresh = function() {
@@ -285,8 +287,9 @@
 
 			modal.scope.show = function() {
 				modal.scope.outages = [];
-				startRefresh();
-				modal.show();
+				modal.scope.refreshOutages().then(function() {
+					modal.show();
+				});
 			};
 			modal.scope.hide = function() {
 				modal.hide();

diff --git a/www/templates/outages.html b/www/templates/outages.html
@@ -8,6 +8,9 @@ <h1 class="title">Nodes with Outages</h1>
 	<ion-content>
 		<ion-refresher pulling-text="Pull to Refresh..." on-refresh="refreshOutages()"></ion-refresher>
 		<ion-list>
+				<ion-item ng-if="error" class="item-text-wrap error">
+					Error: Unable to retrieve outage summaries.
+				</ion-item>
 				<span ng-repeat="outage in outages track by outage.nodeId">
 				<ion-item class="item-divider item-compass" ng-click="showNode(outage.nodeId)">
 					<span class="item-note">{{outage.down.fromNow()}}</span>