bitwarden/web
1
0
Fork 0
mirror of https://github.com/bitwarden/web synced 2026-01-01 08:03:13 +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

6
src/app/organizations/manage/policies.component.ts
View File

@@ -80,9 +80,9 @@ export class PoliciesComponent implements OnInit {
display: true,
},
{
name: this.i18nService.t('onlyOrg'),
description: this.i18nService.t('onlyOrgDesc'),
type: PolicyType.OnlyOrg,
name: this.i18nService.t('singleOrg'),
description: this.i18nService.t('singleOrgDesc'),
type: PolicyType.SingleOrg,
enabled: false,
display: true,
},

4
src/app/organizations/manage/policy-edit.component.html
View File

@@ -17,9 +17,9 @@
title="{{'warning' | i18n}}" icon="fa-warning">
{{'twoStepLoginPolicyWarning' | i18n}}
</app-callout>
<app-callout type="warning" *ngIf="type === policyType.OnlyOrg" title="{{'warning' | i18n}}"
<app-callout type="warning" *ngIf="type === policyType.SingleOrg" title="{{'warning' | i18n}}"
icon="fa-warning">
{{'onlyOrgPolicyWarning' | i18n}}
{{'singleOrgPolicyWarning' | i18n}}
</app-callout>
<app-callout type="tip" title="{{'prerequisite' | i18n}}" *ngIf="type === policyType.RequireSso">
{{'requireSsoPolicyReq' | i18n}}

6
src/app/organizations/manage/policy-edit.component.ts
View File

@@ -178,9 +178,9 @@ export class PolicyEditComponent implements OnInit {
if (!this.enabled) { // Don't need prevalidation checks if submitting to disable
return true;
}
// Have OnlyOrg policy enabled?
if (!(this.policiesEnabledMap.has(PolicyType.OnlyOrg)
&& this.policiesEnabledMap.get(PolicyType.OnlyOrg))) {
// Have SingleOrg policy enabled?
if (!(this.policiesEnabledMap.has(PolicyType.SingleOrg)
&& this.policiesEnabledMap.get(PolicyType.SingleOrg))) {
this.toasterService.popAsync('error', null, this.i18nService.t('requireSsoPolicyReqError'));
return false;
}