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

The "visible" attribute name is getting removed by the grunt angular lib; rename it to fix the problem temporarily and filed a bug: https://github.com/ericclemmons/grunt-angular-templates/issues/97

Browse source
This commit is contained in:
Joseph Schorr 2014-07-15 14:17:57 -04:00
parent c9a33c60b2
commit 8502b590a3
5 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

19
static/js/app.js
View file

@ -2223,7 +2223,7 @@ quayApp.directive('billingInvoices', function () {
scope: { scope: {
'organization': '=organization', 'organization': '=organization',
'user': '=user', 'user': '=user',
'visible': '=visible' 'makevisible': '=makevisible'
}, },
controller: function($scope, $element, $sce, ApiService) { controller: function($scope, $element, $sce, ApiService) {
$scope.loading = false; $scope.loading = false;
@ -2238,7 +2238,7 @@ quayApp.directive('billingInvoices', function () {
var hasValidOrg = !!$scope.organization; var hasValidOrg = !!$scope.organization;
var isValid = hasValidUser || hasValidOrg; var isValid = hasValidUser || hasValidOrg;
if (!$scope.visible || !isValid) { if (!$scope.makevisible || !isValid) {
return; return;
} }
@ -2252,7 +2252,7 @@ quayApp.directive('billingInvoices', function () {
$scope.$watch('organization', update); $scope.$watch('organization', update);
$scope.$watch('user', update); $scope.$watch('user', update);
$scope.$watch('visible', update); $scope.$watch('makevisible', update);
} }
}; };
@ -2270,7 +2270,7 @@ quayApp.directive('logsView', function () {
scope: { scope: {
'organization': '=organization', 'organization': '=organization',
'user': '=user', 'user': '=user',
'visible': '=visible', 'makevisible': '=makevisible',
'repository': '=repository', 'repository': '=repository',
'performer': '=performer' 'performer': '=performer'
}, },
@ -2444,7 +2444,7 @@ quayApp.directive('logsView', function () {
var hasValidRepo = $scope.repository && $scope.repository.namespace; var hasValidRepo = $scope.repository && $scope.repository.namespace;
var isValid = hasValidUser || hasValidOrg || hasValidRepo; var isValid = hasValidUser || hasValidOrg || hasValidRepo;
if (!$scope.visible || !isValid) { if (!$scope.makevisible || !isValid) {
return; return;
} }
@ -2477,6 +2477,7 @@ quayApp.directive('logsView', function () {
$scope.logsPath = '/api/v1/' + url; $scope.logsPath = '/api/v1/' + url;
if (!$scope.chart) { if (!$scope.chart) {
window.console.log('creating chart');
$scope.chart = new LogUsageChart(logKinds); $scope.chart = new LogUsageChart(logKinds);
$($scope.chart).bind('filteringChanged', function(e) { $($scope.chart).bind('filteringChanged', function(e) {
$scope.$apply(function() { $scope.kindsAllowed = e.allowed; }); $scope.$apply(function() { $scope.kindsAllowed = e.allowed; });
@ -2510,7 +2511,7 @@ quayApp.directive('logsView', function () {
$scope.$watch('organization', update); $scope.$watch('organization', update);
$scope.$watch('user', update); $scope.$watch('user', update);
$scope.$watch('repository', update); $scope.$watch('repository', update);
$scope.$watch('visible', update); $scope.$watch('makevisible', update);
$scope.$watch('performer', update); $scope.$watch('performer', update);
$scope.$watch('logStartDate', update); $scope.$watch('logStartDate', update);
$scope.$watch('logEndDate', update); $scope.$watch('logEndDate', update);
@ -2530,7 +2531,7 @@ quayApp.directive('applicationManager', function () {
restrict: 'C', restrict: 'C',
scope: { scope: {
'organization': '=organization', 'organization': '=organization',
'visible': '=visible' 'makevisible': '=makevisible'
}, },
controller: function($scope, $element, ApiService) { controller: function($scope, $element, ApiService) {
$scope.loading = false; $scope.loading = false;
@ -2564,7 +2565,7 @@ quayApp.directive('applicationManager', function () {
}; };
var update = function() { var update = function() {
if (!$scope.organization || !$scope.visible) { return; } if (!$scope.organization || !$scope.makevisible) { return; }
if ($scope.loading) { return; } if ($scope.loading) { return; }
$scope.loading = true; $scope.loading = true;
@ -2580,7 +2581,7 @@ quayApp.directive('applicationManager', function () {
}; };
$scope.$watch('organization', update); $scope.$watch('organization', update);
$scope.$watch('visible', update); $scope.$watch('makevisible', update);
} }
}; };
return directiveDefinitionObject; return directiveDefinitionObject;

6
static/partials/org-admin.html
View file

@ -66,12 +66,12 @@
<!-- Logs tab --> <!-- Logs tab -->
<div id="logs" class="tab-pane"> <div id="logs" class="tab-pane">
<div class="logs-view" organization="organization" visible="logsShown"></div> <div class="logs-view" organization="organization" makevisible="logsShown"></div>
</div> </div>
<!-- Applications tab --> <!-- Applications tab -->
<div id="applications" class="tab-pane"> <div id="applications" class="tab-pane">
<div class="application-manager" organization="organization" visible="applicationsShown"></div> <div class="application-manager" organization="organization" makevisible="applicationsShown"></div>
</div> </div>
<!-- Billing Options tab --> <!-- Billing Options tab -->
@ -81,7 +81,7 @@
<!-- Billing History tab --> <!-- Billing History tab -->
<div id="billing" class="tab-pane" quay-require="['BILLING']"> <div id="billing" class="tab-pane" quay-require="['BILLING']">
<div class="billing-invoices" organization="organization" visible="invoicesShown"></div> <div class="billing-invoices" organization="organization" makevisible="invoicesShown"></div>
</div> </div>
<!-- Members tab --> <!-- Members tab -->

2
static/partials/org-member-logs.html
View file

@ -1,6 +1,6 @@
<div class="resource-view" resource="memberResource" error-message="'Member not found'"> <div class="resource-view" resource="memberResource" error-message="'Member not found'">
<div class="org-member-logs container"> <div class="org-member-logs container">
<div class="organization-header" organization="organization" clickable="true"></div> <div class="organization-header" organization="organization" clickable="true"></div>
<div class="logs-view" organization="organization" performer="memberInfo" visible="organization && memberInfo && ready"></div> <div class="logs-view" organization="organization" performer="memberInfo" makevisible="organization && memberInfo && ready"></div>
</div> </div>
</div> </div>

2
static/partials/repo-admin.html
View file

@ -33,7 +33,7 @@
<div class="tab-content"> <div class="tab-content">
<!-- Logs tab --> <!-- Logs tab -->
<div id="logs" class="tab-pane"> <div id="logs" class="tab-pane">
<div class="logs-view" repository="repo" visible="logsShown"></div> <div class="logs-view" repository="repo" makevisible="logsShown"></div>
</div> </div>
<!-- Badge tab --> <!-- Badge tab -->

4
static/partials/user-admin.html
View file

@ -98,7 +98,7 @@
<!-- Logs tab --> <!-- Logs tab -->
<div id="logs" class="tab-pane"> <div id="logs" class="tab-pane">
<div class="logs-view" user="user" visible="logsShown"></div> <div class="logs-view" user="user" makevisible="logsShown"></div>
</div> </div>
<!-- Plans tab --> <!-- Plans tab -->
@ -195,7 +195,7 @@
<!-- Billing History tab --> <!-- Billing History tab -->
<div id="billing" class="tab-pane" quay-require="['BILLING']"> <div id="billing" class="tab-pane" quay-require="['BILLING']">
<div class="billing-invoices" user="user" visible="invoicesShown"></div> <div class="billing-invoices" user="user" makevisible="invoicesShown"></div>
</div> </div>
<!-- Convert to organization tab --> <!-- Convert to organization tab -->