bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-31 07:33:23 +00:00
Code Issues Releases Wiki Activity

Only org to single org (#680)

Browse Source 
* change OnlyOrg references to SingleOrg

* updated jslib

* change OnlyOrg references to SingleOrg

* missed a reference to OnlyOrg in messages
This commit is contained in:
Addison Beck
2020-10-27 10:28:57 -04:00
committed by GitHub
parent f6946085d8
commit ebe5a6030e
7 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/settings/organization-plans.component.html
View File

@@ -222,8 +222,8 @@
<small class="text-muted font-italic mt-2 d-block" *ngIf="!createOrganization">
{{'paymentCharged' | i18n : (interval | i18n) }}</small>
</div>
<div *ngIf="onlyOrgPolicyBlock" class="mt-4">
<app-callout [type]="'error'">{{'onlyOrgBlockCreateMessage' | i18n}}</app-callout>
<div *ngIf="singleOrgPolicyBlock" class="mt-4">
<app-callout [type]="'error'">{{'singleOrgBlockCreateMessage' | i18n}}</app-callout>
</div>
<div class="mt-4">
<button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">

10
src/app/settings/organization-plans.component.ts
View File

@@ -58,7 +58,7 @@ export class OrganizationPlansComponent implements OnInit {
businessName: string;
productTypes = ProductType;
formPromise: Promise<any>;
onlyOrgPolicyBlock: boolean = false;
singleOrgPolicyBlock: boolean = false;
plans: PlanResponse[];
@@ -197,12 +197,12 @@ export class OrganizationPlansComponent implements OnInit {
}
async submit() {
if (this.onlyOrgPolicyBlock) {
if (this.singleOrgPolicyBlock) {
return;
} else {
const policies = await this.policyService.getAll(PolicyType.OnlyOrg);
this.onlyOrgPolicyBlock = policies.some(policy => policy.enabled);
if (this.onlyOrgPolicyBlock) {
const policies = await this.policyService.getAll(PolicyType.SingleOrg);
this.singleOrgPolicyBlock = policies.some(policy => policy.enabled);
if (this.singleOrgPolicyBlock) {
return;
}
}