vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of ssh://bitbucket.org/yackob03/quay

Browse source
This commit is contained in:
jakedt 2014-03-06 12:51:34 -05:00
commit 0d4c66312b
3 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
static/js/controllers.js
View file

@ -825,8 +825,8 @@ function BuildPackageCtrl($scope, Restangular, ApiService, $routeParams, $rootSc
if (dockerfileFolder[0] == '/') { if (dockerfileFolder[0] == '/') {
dockerfileFolder = dockerfileFolder.substr(1); dockerfileFolder = dockerfileFolder.substr(1);
} }
if (dockerfileFolder[dockerfileFolder.length - 1] == '/') { if (dockerfileFolder && dockerfileFolder[dockerfileFolder.length - 1] != '/') {
dockerfileFolder = dockerfileFolder.substr(0, dockerfileFolder.length - 1); dockerfileFolder += '/';
} }
dockerfilePath = dockerfileFolder + 'Dockerfile'; dockerfilePath = dockerfileFolder + 'Dockerfile';
@ -940,7 +940,7 @@ function RepoBuildCtrl($scope, Restangular, ApiService, $routeParams, $rootScope
} }
}); });
$scope.builds = []; $scope.builds = null;
$scope.polling = false; $scope.polling = false;
$scope.buildDialogShowCounter = 0; $scope.buildDialogShowCounter = 0;
@ -1004,6 +1004,8 @@ function RepoBuildCtrl($scope, Restangular, ApiService, $routeParams, $rootScope
}; };
$scope.setCurrentBuild = function(buildId, opt_updateURL) { $scope.setCurrentBuild = function(buildId, opt_updateURL) {
if (!$scope.builds) { return; }
// Find the build. // Find the build.
for (var i = 0; i < $scope.builds.length; ++i) { for (var i = 0; i < $scope.builds.length; ++i) {
if ($scope.builds[i].id == buildId) { if ($scope.builds[i].id == buildId) {

6
static/partials/build-package.html
View file

@ -37,9 +37,9 @@
<div class="tab-content"> <div class="tab-content">
<!-- Dockerfile view --> <!-- Dockerfile view -->
<div class="tab-pane active" id="dockerfile"> <div class="tab-pane active" id="dockerfile">
<div class="dockerfile-path">{{ dockerFilePath }}</div> <div class="dockerfile-path" ng-if="dockerFileContents">{{ dockerFilePath }}</div>
<div class="dockerfile-view" contents="dockerFileContents"></div> <div class="dockerfile-view" contents="dockerFileContents" ng-if="dockerFileContents"></div>
<span ng-show="!dockerFileContents">No Dockerfile found in the build pack</span> <span ng-if="!dockerFileContents">No Dockerfile found in the build pack</span>
</div> </div>
<!-- File tree --> <!-- File tree -->

6
static/partials/repo-build.html
View file

@ -18,7 +18,11 @@
</div> </div>
</div> </div>
<div class="row" ng-show="!builds.length"> <div class="row" ng-show="!builds">
<div class="quay-spinner"></div>
</div>
<div class="row" ng-show="builds && !builds.length">
There are no builds for this repository There are no builds for this repository
</div> </div>