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

Merge pull request #1416 from coreos-inc/fixsetupbill

Browse source 
Make sure to hide the billing header when billing is disabled
This commit is contained in:
josephschorr 2016-04-28 15:42:11 -04:00
commit 5a85dc01d9
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
static/js/directives/ui/billing-management-panel.js
View file

@ -13,7 +13,7 @@ angular.module('quay').directive('billingManagementPanel', function () {
'organization': '=organization', 'organization': '=organization',
'isEnabled': '=isEnabled' 'isEnabled': '=isEnabled'
}, },
controller: function($scope, $element, PlanService, ApiService) { controller: function($scope, $element, PlanService, ApiService, Features) {
$scope.currentCard = null; $scope.currentCard = null;
$scope.subscription = null; $scope.subscription = null;
$scope.updating = true; $scope.updating = true;
@ -41,7 +41,7 @@ angular.module('quay').directive('billingManagementPanel', function () {
}; };
var update = function() { var update = function() {
if (!$scope.isEnabled || !($scope.user || $scope.organization)) { if (!$scope.isEnabled || !($scope.user || $scope.organization) || !Features.BILLING) {
return; return;
} }

2
static/partials/org-view.html
View file

@ -119,7 +119,7 @@
</div> </div>
<!-- Billing Information --> <!-- Billing Information -->
<div class="settings-section"> <div class="settings-section" quay-show="Features.BILLING">
<h3>Billing Information</h3> <h3>Billing Information</h3>
<div class="billing-management-panel" organization="organization" is-enabled="showBillingCounter"></div> <div class="billing-management-panel" organization="organization" is-enabled="showBillingCounter"></div>
</div> </div>

2
static/partials/user-view.html
View file

@ -131,7 +131,7 @@
</div> </div>
<!-- Billing Information --> <!-- Billing Information -->
<div class="settings-section"> <div class="settings-section" quay-show="Features.BILLING">
<h3>Billing Information</h3> <h3>Billing Information</h3>
<div class="billing-management-panel" user="context.viewuser" is-enabled="showBillingCounter"></div> <div class="billing-management-panel" user="context.viewuser" is-enabled="showBillingCounter"></div>
</div> </div>