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

Clarify the namespace being deleted

Browse source 
Fixes https://www.pivotaltracker.com/story/show/141418611
This commit is contained in:
Joseph Schorr 2017-03-10 13:25:40 -05:00
parent 47a99fccb6
commit 409ee6137f
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
static/directives/delete-namespace-view.html
View file

@ -1,12 +1,12 @@
<div class="delete-namespace-view-element" quay-show="!Features.BILLING || subscriptionStatus != 'loading'"> <div class="delete-namespace-view-element" quay-show="!Features.BILLING || subscriptionStatus != 'loading'">
<table class="co-list-table"> <table class="co-list-table">
<tr> <tr>
<td>Delete Account:</td> <td>Delete {{ namespaceTitle }}:</td>
<td quay-show="!Features.BILLING || subscriptionStatus == 'none'"> <td quay-show="!Features.BILLING || subscriptionStatus == 'none'">
<a class="co-modify-link" ng-click="showDeleteNamespace()">Begin deletion</a> <a class="co-modify-link" ng-click="showDeleteNamespace()">Begin deletion</a>
</td> </td>
<td quay-show="Features.BILLING && subscriptionStatus == 'valid'"> <td quay-show="Features.BILLING && subscriptionStatus == 'valid'">
<i class="fa fa-exclamation-triangle yellow"></i> You must cancel your billing subscription before this account can be deleted. <i class="fa fa-exclamation-triangle yellow"></i> You must cancel your billing subscription before this {{ namespaceTitle }} can be deleted.
</td> </td>
</tr> </tr>
</table> </table>
@ -15,14 +15,14 @@
<div class="cor-confirm-dialog" <div class="cor-confirm-dialog"
dialog-context="deleteNamespaceInfo" dialog-context="deleteNamespaceInfo"
dialog-action="deleteNamespace(info, callback)" dialog-action="deleteNamespace(info, callback)"
dialog-title="Delete Account" dialog-title="Delete {{ namespaceTitle }}"
dialog-action-title="Delete Account" dialog-action-title="Delete {{ namespaceTitle }}"
dialog-form="context.deleteform" dialog-form="context.deleteform"
dialog-button-class="btn-danger"> dialog-button-class="btn-danger">
<form name="context.deleteform" class="co-single-field-dialog"> <form name="context.deleteform" class="co-single-field-dialog">
<div class="co-alert co-alert-danger"> <div class="co-alert co-alert-danger">
Deleting an account is <strong>non-reversable</strong> and will delete Deleting an {{ namespaceTitle }} is <strong>non-reversable</strong> and will delete
<strong>all of the account's data</strong> including repositories, created build triggers, <strong>all of the {{ namespaceTitle }}'s data</strong> including repositories, created build triggers,
and notifications. and notifications.
</div> </div>

3
static/js/directives/ui/delete-namespace-view.js
View file

@ -11,7 +11,8 @@ angular.module('quay').directive('deleteNamespaceView', function () {
scope: { scope: {
'user': '=user', 'user': '=user',
'organization': '=organization', 'organization': '=organization',
'subscriptionStatus': '=subscriptionStatus' 'subscriptionStatus': '=subscriptionStatus',
'namespaceTitle': '@namespaceTitle'
}, },
controller: function($scope, $element, UserService) { controller: function($scope, $element, UserService) {
$scope.context = {}; $scope.context = {};

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

@ -118,7 +118,7 @@
</tr> </tr>
</table> </table>
<div class="delete-namespace-view" subscription-status="subscriptionStatus" organization="organization"></div> <div class="delete-namespace-view" subscription-status="subscriptionStatus" organization="organization" namespace-title="organization"></div>
</div> </div>
<!-- Billing Information --> <!-- Billing Information -->

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

@ -134,8 +134,7 @@
</tr> </tr>
</table> </table>
<div class="delete-namespace-view" subscription-status="subscriptionStatus" user="context.viewuser" <div class="delete-namespace-view" subscription-status="subscriptionStatus" user="context.viewuser" namespace-title="account" quay-show="Config.AUTHENTICATION_TYPE == 'Database'"></div>
quay-show="Config.AUTHENTICATION_TYPE == 'Database'"></div>
</div> </div>
<!-- Billing Information --> <!-- Billing Information -->