From 256503ca75df197b168b104a7d595a373d417385 Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Wed, 5 Mar 2014 18:04:01 -0500 Subject: [PATCH 1/3] Fix the build package path handling --- static/js/controllers.js | 4 ++-- static/partials/build-package.html | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/static/js/controllers.js b/static/js/controllers.js index d63586c27..bc802931e 100644 --- a/static/js/controllers.js +++ b/static/js/controllers.js @@ -825,8 +825,8 @@ function BuildPackageCtrl($scope, Restangular, ApiService, $routeParams, $rootSc if (dockerfileFolder[0] == '/') { dockerfileFolder = dockerfileFolder.substr(1); } - if (dockerfileFolder[dockerfileFolder.length - 1] == '/') { - dockerfileFolder = dockerfileFolder.substr(0, dockerfileFolder.length - 1); + if (dockerfileFolder && dockerFileFolder[dockerFileFolder.length - 1] != '/') { + dockerfileFolder += '/'; } dockerfilePath = dockerfileFolder + 'Dockerfile'; diff --git a/static/partials/build-package.html b/static/partials/build-package.html index 5ca4dfd13..7bd6529ea 100644 --- a/static/partials/build-package.html +++ b/static/partials/build-package.html @@ -37,9 +37,9 @@
-
{{ dockerFilePath }}
-
- No Dockerfile found in the build pack +
{{ dockerFilePath }}
+
+ No Dockerfile found in the build pack
From 9f2841d40ba9ce2db9b62f1be6da9f23f18f956e Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Wed, 5 Mar 2014 18:07:50 -0500 Subject: [PATCH 2/3] Fix case typos --- static/js/controllers.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/js/controllers.js b/static/js/controllers.js index bc802931e..5a53be0de 100644 --- a/static/js/controllers.js +++ b/static/js/controllers.js @@ -825,7 +825,7 @@ function BuildPackageCtrl($scope, Restangular, ApiService, $routeParams, $rootSc if (dockerfileFolder[0] == '/') { dockerfileFolder = dockerfileFolder.substr(1); } - if (dockerfileFolder && dockerFileFolder[dockerFileFolder.length - 1] != '/') { + if (dockerfileFolder && dockerfileFolder[dockerfileFolder.length - 1] != '/') { dockerfileFolder += '/'; } From a9f70c6e3a9194fbf6fbeeaef559c3fa1a137331 Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Wed, 5 Mar 2014 18:13:04 -0500 Subject: [PATCH 3/3] Show a spinner when loading the build info --- static/js/controllers.js | 4 +++- static/partials/repo-build.html | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/static/js/controllers.js b/static/js/controllers.js index 5a53be0de..936886fc5 100644 --- a/static/js/controllers.js +++ b/static/js/controllers.js @@ -940,7 +940,7 @@ function RepoBuildCtrl($scope, Restangular, ApiService, $routeParams, $rootScope } }); - $scope.builds = []; + $scope.builds = null; $scope.polling = false; $scope.buildDialogShowCounter = 0; @@ -1004,6 +1004,8 @@ function RepoBuildCtrl($scope, Restangular, ApiService, $routeParams, $rootScope }; $scope.setCurrentBuild = function(buildId, opt_updateURL) { + if (!$scope.builds) { return; } + // Find the build. for (var i = 0; i < $scope.builds.length; ++i) { if ($scope.builds[i].id == buildId) { diff --git a/static/partials/repo-build.html b/static/partials/repo-build.html index 4ff47b487..f7aec4838 100644 --- a/static/partials/repo-build.html +++ b/static/partials/repo-build.html @@ -18,7 +18,11 @@
-
+
+
+
+ +
There are no builds for this repository