Merge pull request #1300 from MarkDeMaria/promisesCreate

Merged by openshift-bot

Author: OpenShift Bot

app/scripts/controllers/create.js

@@ -52,27 +52,27 @@ angular.module('openshiftConsole')
 
         // List image streams and templates in the both the shared `openshift`
         // namespace and the project namespace.
-        DataService.list("imagestreams", {namespace: "openshift"}, function(imageStreams) {
-          $scope.openshiftImageStreams = imageStreams.by("metadata.name");
-        });
+        DataService.list("imagestreams", {namespace: "openshift"}).then(function(resp) {
+            $scope.openshiftImageStreams = resp.by("metadata.name");
+          });
 
-        DataService.list("templates", {namespace: "openshift"}, function(templates) {
-          $scope.openshiftTemplates = templates.by("metadata.name");
-        });
+        DataService.list("templates", {namespace: "openshift"}).then(function(resp) {
+            $scope.openshiftTemplates = resp.by("metadata.name");
+          });
 
         // If the current namespace is `openshift`, don't request the same
         // templates and image streams again.
         if ($routeParams.project === 'openshift') {
           $scope.projectImageStreams = [];
           $scope.projectTemplates = [];
         } else {
-          DataService.list("imagestreams", context, function(imageStreams) {
-            $scope.projectImageStreams = imageStreams.by("metadata.name");
-          });
+          DataService.list("imagestreams", context).then(function(resp) {
+              $scope.projectImageStreams = resp.by("metadata.name");
+            });
 
-          DataService.list("templates", context, function(templates) {
-            $scope.projectTemplates = templates.by("metadata.name");
-          });
+          DataService.list("templates", context).then(function(resp) {
+              $scope.projectTemplates = resp.by("metadata.name");
+            });
         }
       }));
   });

dist/scripts/scripts.js

@@ -8891,15 +8891,15 @@ title:"Add to Project"
 } ], m.get(e.project).then(_.spread(function(c, d) {
 a.project = c, a.context = d, a.breadcrumbs[0].title = b("displayName")(c), j.list("imagestreams", {
 namespace:"openshift"
-}, function(b) {
+}).then(function(b) {
 a.openshiftImageStreams = b.by("metadata.name");
 }), j.list("templates", {
 namespace:"openshift"
-}, function(b) {
+}).then(function(b) {
 a.openshiftTemplates = b.by("metadata.name");
-}), "openshift" === e.project ? (a.projectImageStreams = [], a.projectTemplates = []) :(j.list("imagestreams", d, function(b) {
+}), "openshift" === e.project ? (a.projectImageStreams = [], a.projectTemplates = []) :(j.list("imagestreams", d).then(function(b) {
 a.projectImageStreams = b.by("metadata.name");
-}), j.list("templates", d, function(b) {
+}), j.list("templates", d).then(function(b) {
 a.projectTemplates = b.by("metadata.name");
 }));
 }));