Bug 1230652 - Simplify front-end performance framework model

mozilla · Apr 12, 2016 · 9644d27 · 9644d27
1 parent 4d4177b
commit 9644d27
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/ui/js/controllers/perf/alerts.js b/ui/js/controllers/perf/alerts.js
@@ -539,7 +539,7 @@ perf.controller('AlertsCtrl', [
         ThRepositoryModel.load().then(function(response) {
             $q.all([PhFramework.getFrameworkList().then(
                 function(frameworks) {
-                    $scope.frameworks = frameworks.data;
+                    $scope.frameworks = frameworks;
                 }),
                     ThOptionCollectionModel.getMap().then(
                         function(optionCollectionMap) {

diff --git a/ui/js/controllers/perf/compare.js b/ui/js/controllers/perf/compare.js
@@ -310,7 +310,7 @@ perf.controller('CompareResultsCtrl', [
         var loadRepositories = ThRepositoryModel.load();
         var loadFrameworks = PhFramework.getFrameworkList().then(
             function(frameworks) {
-                $scope.frameworks = frameworks.data;
+                $scope.frameworks = frameworks;
             });
         $q.all([loadRepositories, loadFrameworks]).then(function() {
             $scope.errors = PhCompare.validateInput($stateParams.originalProject,

diff --git a/ui/js/models/perf/performance_framework.js b/ui/js/models/perf/performance_framework.js
@@ -7,7 +7,9 @@ treeherder.factory(
             return {
                 getFrameworkList: function() {
                     return $http.get(thServiceDomain +
-                                     '/api/performance/framework/');
+                                     '/api/performance/framework/').then(function(response) {
+                                         return response.data;
+                                     });
                 }
             };
         }]);
diff --git a/ui/js/perf.js b/ui/js/perf.js
@@ -78,9 +78,7 @@ treeherder.factory('PhSeries', ['$http', 'thServiceDomain', 'ThOptionCollectionM
             return $http.get(thServiceDomain + '/api/project/' + projectName +
                              '/performance/platforms/', { params: { interval: interval } }).then(
                                  function(response) {
-                                     return {
-                                         platformList: response.data
-                                     };
+                                     return response.data;
                                  });
         },
         getSeriesData: function(projectName, params) {