Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

org/space: allowed quota to be specified on creation/edition #3593

Merged
merged 7 commits into from
Jun 3, 2019
Merged

org/space: allowed quota to be specified on creation/edition #3593

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
effa28f
org/space: allowed quota to be specified on creation/edition
May 8, 2019
2b03dc6
Handle the fallback to org quota better
richard-cox May 21, 2019
8b082e2
org/space quota: improved field behavior
May 27, 2019
422cd13
space: fixed null exception when visiting page directly
May 28, 2019
5d0a53d
org/space quota (e2e): improved test cases
May 28, 2019
b2682e5
Fix issue where the same space quota list was shown regardless of org…
richard-cox May 30, 2019
732358b
Tweak text
richard-cox May 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Tweak text
  • Loading branch information
@richard-cox
richard-cox committed May 30, 2019
commit 732358bfef3916aa0845640dccb616d593232127
2 changes: 1 addition & 1 deletion ...e/src/features/cloud-foundry/add-space/create-space-step/create-space-step.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</mat-form-field>
<mat-form-field *ngIf="hasSpaceQuotas$ | async">
<mat-select class="form-control" formControlName="quotaDefinition" placeholder="Quota Definition">
<mat-option [value]="0" *ngIf="hasSpaceQuotas$ | async">None (defaults to organization's quota)</mat-option>
<mat-option [value]="0" *ngIf="hasSpaceQuotas$ | async">None</mat-option>
<mat-option *ngFor="let quota of quotaDefinitions$ | async" [value]="quota.metadata.guid">{{ quota.entity.name }}
</mat-option>
</mat-select>
Expand Down
1 change: 0 additions & 1 deletion ...ud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<div class="edit-org">
<div>Specify the new name for the organization </div>
<form [formGroup]="editOrgName" class="stepper-form">
<mat-form-field>
<input matInput formControlName="orgName" placeholder="Organization Name" required [appFocus]="true">
Expand Down
3 changes: 1 addition & 2 deletions ...core/src/features/cloud-foundry/edit-space/edit-space-step/edit-space-step.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<div class="edit-space">
<div>Specify the new name for the space</div>
<form [formGroup]="editSpaceForm" class="stepper-form">
<mat-form-field>
<input matInput formControlName="spaceName" [(ngModel)]="spaceName" placeholder="Space Name" [appFocus]="true">
Expand All @@ -9,7 +8,7 @@
</mat-form-field>
<mat-form-field *ngIf="hasSpaceQuotas$ | async">
<mat-select class="form-control" formControlName="quotaDefinition" placeholder="Quota Definition">
<mat-option [value]="0" *ngIf="hasSpaceQuotas$ | async">None (defaults to organization's quota)</mat-option>
<mat-option [value]="0" *ngIf="hasSpaceQuotas$ | async">None</mat-option>
<mat-option *ngFor="let quota of quotaDefinitions$ | async" [value]="quota.metadata.guid">{{ quota.entity.name }}
</mat-option>
</mat-select>
Expand Down