Merge pull request #2850 from coreos-inc/jpmc-features

Features for JPMC
This commit is contained in:
josephschorr 2017-08-16 14:29:00 -04:00 committed by GitHub
commit 46e1bd9c75
8 changed files with 37 additions and 10 deletions

View file

@ -1,7 +1,7 @@
<span class="build-mini-status-element">
<span class="anchor"
href="/repository/{{ build.repository.namespace }}/{{ build.repository.name }}/build/{{ build.id }}"
is-only-text="!isAdmin">
is-only-text="!canView">
<div>
<span class="build-state-icon" build="build"></span>
<span class="timing">

View file

@ -40,7 +40,7 @@
<!-- Builds -->
<div ng-if="builds && builds.length">
<div class="build-mini-status" ng-repeat="build in builds" build="build"
is-admin="repository.can_admin"></div>
can-view="repository.can_write || Features.READER_BUILD_LOGS"></div>
</div>
<!-- View All -->

View file

@ -13,7 +13,9 @@ angular.module('quay').directive('repoPanelInfo', function () {
'builds': '=builds',
'isEnabled': '=isEnabled'
},
controller: function($scope, $element, ApiService, Config) {
controller: function($scope, $element, ApiService, Config, Features) {
$scope.Features = Features;
$scope.$watch('repository', function(repository) {
if (!$scope.repository) { return; }

View file

@ -10,7 +10,7 @@ angular.module('quay').directive('buildMiniStatus', function () {
restrict: 'C',
scope: {
'build': '=build',
'isAdmin': '=isAdmin'
'canView': '=canView'
},
controller: function($scope, $element, BuildService) {
$scope.isBuilding = function(build) {

View file

@ -11,7 +11,7 @@
}]);
function RepoListCtrl($scope, $sanitize, $q, Restangular, UserService, ApiService, Features) {
function RepoListCtrl($scope, $sanitize, $q, Restangular, UserService, ApiService, Features, Config) {
$scope.namespace = null;
$scope.page = 1;
$scope.publicPageCount = null;
@ -35,7 +35,8 @@
user.organizations.map(function(org) {
$scope.namespaces.push({
'name': org.name,
'avatar': org.avatar
'avatar': org.avatar,
'public': org.public
});
});
@ -99,7 +100,8 @@
var options = {
'namespace': namespace.name,
'last_modified': true,
'popularity': true
'popularity': true,
'public': namespace.public
};
namespace.repositories = ApiService.listReposAsResource().withOptions(options).get(function(resp) {