Merge pull request #1359 from MarkDeMaria/promisesQuota

Merged by openshift-bot

Author: OpenShift Bot

app/scripts/controllers/quota.js

@@ -101,14 +101,14 @@ angular.module('openshiftConsole')
       .then(_.spread(function(project, context) {
         $scope.project = project;
 
-        DataService.list("resourcequotas", context, function(quotas) {
-          $scope.quotas = _.sortBy(quotas.by("metadata.name"), "metadata.name");
+        DataService.list("resourcequotas", context).then(function(resp) {
+          $scope.quotas = _.sortBy(resp.by("metadata.name"), "metadata.name");
           $scope.orderedTypesByQuota = orderTypes($scope.quotas);
           Logger.log("quotas", $scope.quotas);
         });
 
-        DataService.list("appliedclusterresourcequotas", context, function(quotas) {
-          $scope.clusterQuotas = _.sortBy(quotas.by("metadata.name"), "metadata.name");
+        DataService.list("appliedclusterresourcequotas", context).then(function(resp) {
+          $scope.clusterQuotas = _.sortBy(resp.by("metadata.name"), "metadata.name");
           $scope.orderedTypesByClusterQuota = orderTypes($scope.clusterQuotas);
           $scope.namespaceUsageByClusterQuota = {};
           _.each($scope.clusterQuotas, function(quota) {
@@ -120,8 +120,8 @@ angular.module('openshiftConsole')
           Logger.log("cluster quotas", $scope.clusterQuotas);
         });
 
-        DataService.list("limitranges", context, function(limitRanges) {
-          $scope.limitRanges = _.sortBy(limitRanges.by("metadata.name"), "metadata.name");
+        DataService.list("limitranges", context).then(function(resp) {
+          $scope.limitRanges = _.sortBy(resp.by("metadata.name"), "metadata.name");
           $scope.emptyMessageLimitRanges = "There are no limit ranges set on this project.";
           // Convert to a sane format for a view to a build a table with rows per resource type
           angular.forEach($scope.limitRanges, function(limitRange){

dist/scripts/scripts.js

@@ -5104,9 +5104,9 @@ b[a.metadata.name] = d;
 }), b;
 };
 e.get(b.project).then(_.spread(function(a, e) {
-c.project = a, d.list("resourcequotas", e, function(a) {
+c.project = a, d.list("resourcequotas", e).then(function(a) {
 c.quotas = _.sortBy(a.by("metadata.name"), "metadata.name"), c.orderedTypesByQuota = k(c.quotas), f.log("quotas", c.quotas);
-}), d.list("appliedclusterresourcequotas", e, function(a) {
+}), d.list("appliedclusterresourcequotas", e).then(function(a) {
 c.clusterQuotas = _.sortBy(a.by("metadata.name"), "metadata.name"), c.orderedTypesByClusterQuota = k(c.clusterQuotas), c.namespaceUsageByClusterQuota = {}, _.each(c.clusterQuotas, function(a) {
 if (a.status) {
 var d = _.find(a.status.namespaces, {
@@ -5115,7 +5115,7 @@ namespace:b.project
 c.namespaceUsageByClusterQuota[a.metadata.name] = d.status;
 }
 }), f.log("cluster quotas", c.clusterQuotas);
-}), d.list("limitranges", e, function(a) {
+}), d.list("limitranges", e).then(function(a) {
 c.limitRanges = _.sortBy(a.by("metadata.name"), "metadata.name"), c.emptyMessageLimitRanges = "There are no limit ranges set on this project.", angular.forEach(c.limitRanges, function(a) {
 var b = a.metadata.name;
 c.limitsByType[b] = {}, angular.forEach(a.spec.limits, function(a) {