CRM-13823 - Simplify data loading

diff --git a/ang/crmStatusPage.js b/ang/crmStatusPage.js
index a821a1307318ffb1ee99c40ae7f5fb8d307b1268..a83b2013920f32327879e2d84ec5971f44a6d52e 100644 (file)
--- a/ang/crmStatusPage.js
+++ b/ang/crmStatusPage.js
@@ -12,11 +12,8 @@
       templateUrl: '~/statuspage/StatusPage.html',
 
       resolve: {
-        statuses: function(statuspageGetStatuses) {
-          return statuspageGetStatuses({sequential: 1});
-        },
-        preferences: function(statuspageGetPreferences){
-          return statuspageGetPreferences();
+        statusData: function(crmApi) {
+          return crmApi('System', 'check', {sequential: 1});
         }
       }
     });

diff --git a/ang/crmStatusPage/StatusPage.html b/ang/crmStatusPage/StatusPage.html
index 9100fcc8496048a82d98953456d49ec276da326d..f2ea1d79aa510181b9d43ae2a5f60c3a37ac39e3 100644 (file)
--- a/ang/crmStatusPage/StatusPage.html
+++ b/ang/crmStatusPage/StatusPage.html
@@ -1,6 +1,5 @@
 <div class="crm-container">
   <div crm-ui-debug="statuses"></div>
-  <div crm-ui-debug="preferences"></div>
 
   <form name="crm-system-status" crm-ui-id-scope>
 
@@ -14,7 +13,7 @@
         crm-ui-tab id="tab-{{tab.name}}"
         crm-title="tab.is_visible ? ts('Active') : ts('Hushed/Snoozed')"
         >
-        <div id="crm-status-list" ng-repeat="status in statuses.values | filter:{is_visible: tab.is_visible}" >
+        <div id="crm-status-list" ng-repeat="status in statuses | filter:{is_visible: tab.is_visible}" >
           <h3 class="crm-severity-{{status.severity}}">
             <i ng-if="status.icon" class="crm-i {{status.icon}}"></i>
             {{status.title}}

diff --git a/ang/crmStatusPage/StatusPageCtrl.js b/ang/crmStatusPage/StatusPageCtrl.js
index 52ec83b22e50cb7562eba79b58cb507e28be426c..5182cc6ca8f12196e1c31e8ba7a3ce2f80334b84 100644 (file)
--- a/ang/crmStatusPage/StatusPageCtrl.js
+++ b/ang/crmStatusPage/StatusPageCtrl.js
@@ -3,12 +3,20 @@
   // controller
 
   angular.module('statuspage').controller('statuspageStatusPage',
-    function($scope, crmApi, crmStatus, crmUiHelp, statuses, preferences) {
+    function($scope, crmApi, crmStatus, statusData, statuspageSeverityList) {
 
-    var ts = $scope.ts = CRM.ts();
-    $scope.statuses = statuses;
-    $scope.preferences = preferences;
-    $scope.alert = CRM.alert;
+      var ts = $scope.ts = CRM.ts();
+      $scope.alert = CRM.alert;
+      $scope.statuses = statusData.values;
+
+      _.each($scope.statuses, function(status) {
+        status.severity_id = status.severity;
+        status.severity = statuspageSeverityList[status.severity];
+        status.snoozeOptions = {
+          show: false,
+          severity: status.severity
+        };
+      });
 
     // will "hush" a status - gets the severity level of the status that is being hushed, and hushes all alerts for that check at and below the level of the current check
     $scope.hush = function(name, severity) {

diff --git a/ang/crmStatusPage/StatusPageServices.js b/ang/crmStatusPage/StatusPageServices.js
index 1858a831b36d358cd2a9d7dc280aa39e65185922..9a0c263b9615039ea4065a9c09f3df52558afffc 100644 (file)
--- a/ang/crmStatusPage/StatusPageServices.js
+++ b/ang/crmStatusPage/StatusPageServices.js
@@ -1,43 +1,5 @@
 (function(angular, $, _) {
 
- /**
-  * get status messages
-  * build snooze options object reconciled with preferences
-  *
-  */
-  angular.module('statuspage').service('statuspageGetStatuses', function(crmApi, statuspageSeverityList) {
-    return function(apiFilter) {
-      return crmApi('System', 'check', apiFilter)
-        .catch(function(obj){console.log(obj);})
-        .then(function(apiResults){
-          _.each(apiResults.values, function(status){
-            status.severity_id = status.severity;
-            status.severity = statuspageSeverityList[status.severity];
-            status.snoozeOptions = {
-              show: false,
-              severity: status.severity
-            };
-          });
-          return apiResults;
-        });
-      };
-  });
-
-  angular.module('statuspage').service('statuspageGetPreferences', function(crmApi) {
-    return function() {
-      return crmApi('StatusPreference', 'get')
-        .then(function(apiResults) {
-          _.each(apiResults.values, function(pref){
-            pref.snoozeOptions = {
-              severity: pref.ignore_severity
-            };
-          });
-          return apiResults;
-        });
-    };
-  });
-
-
   angular.module('statuspage').filter('trusted', function($sce){ return $sce.trustAsHtml; });
 
   angular.module('statuspage').service('statuspageSeverityList', function() {