Merge pull request #1363 from MarkDeMaria/promisesCreateFromImage

Merged by openshift-bot

Author: OpenShift Bot

Diff for: app/scripts/controllers/create/createFromImage.js

@@ -230,9 +230,9 @@ angular.module("openshiftConsole")
           $scope.memoryProblems = LimitRangesService.validatePodLimits($scope.limitRanges, 'memory', [$scope.container], project);
         };
 
-        DataService.list("limitranges", context, function(limitRanges) {
-          $scope.limitRanges = limitRanges.by("metadata.name");
-          if ($filter('hashSize')(limitRanges) !== 0) {
+        DataService.list("limitranges", context).then(function(resp) {
+          $scope.limitRanges = resp.by("metadata.name");
+          if (!_.isEmpty($scope.limitRanges)) {
             $scope.$watch('container', validatePodLimits, true);
           }
         });
@@ -249,13 +249,13 @@ angular.module("openshiftConsole")
 
         var quotas, clusterQuotas;
 
-        DataService.list("resourcequotas", context, function(quotaData) {
-          quotas = quotaData.by("metadata.name");
+        DataService.list("resourcequotas", context).then(function(resp) {
+          quotas = resp.by("metadata.name");
           Logger.log("quotas", quotas);
         });
 
         // TODO clean up anything not needed here
-        DataService.list("appliedclusterresourcequotas", context, function(clusterQuotaData) {
+        DataService.list("appliedclusterresourcequotas", context).then(function(clusterQuotaData) {
           clusterQuotas = clusterQuotaData.by("metadata.name");
           Logger.log("cluster quotas", clusterQuotas);
         });

Diff for: dist/scripts/scripts.js

@@ -8260,15 +8260,15 @@ a.project = e, a.breadcrumbs[0].title = r("displayName")(e), d.sourceURI && (a.s
 var s = function() {
 a.hideCPU || (a.cpuProblems = j.validatePodLimits(a.limitRanges, "cpu", [ a.container ], e)), a.memoryProblems = j.validatePodLimits(a.limitRanges, "memory", [ a.container ], e);
 };
-f.list("limitranges", g, function(b) {
-a.limitRanges = b.by("metadata.name"), 0 !== r("hashSize")(b) && a.$watch("container", s, !0);
+f.list("limitranges", g).then(function(b) {
+a.limitRanges = b.by("metadata.name"), _.isEmpty(a.limitRanges) || a.$watch("container", s, !0);
 });
 var u, E, F = function() {
 return a.scaling.autoscale ? void (a.showCPURequestWarning = !l.hasCPURequest([ a.container ], a.limitRanges, e)) :void (a.showCPURequestWarning = !1);
 };
-f.list("resourcequotas", g, function(a) {
+f.list("resourcequotas", g).then(function(a) {
 u = a.by("metadata.name"), b.log("quotas", u);
-}), f.list("appliedclusterresourcequotas", g, function(a) {
+}), f.list("appliedclusterresourcequotas", g).then(function(a) {
 E = a.by("metadata.name"), b.log("cluster quotas", E);
 }), a.$watch("scaling.autoscale", F), a.$watch("container", F, !0), a.$watch("name", function(a) {
 A.value = a;