diff --git a/bitwarden_license/src/Portal/Models/PolicyEditModel.cs b/bitwarden_license/src/Portal/Models/PolicyEditModel.cs index 4d2cf14a5d..7ff89c8d22 100644 --- a/bitwarden_license/src/Portal/Models/PolicyEditModel.cs +++ b/bitwarden_license/src/Portal/Models/PolicyEditModel.cs @@ -16,7 +16,7 @@ namespace Bit.Portal.Models : base(type, false) { // Inject service and create static lists - BuildLists(i18nService); + TranslateStrings(i18nService); } public PolicyEditModel(Policy model, II18nService i18nService) @@ -28,7 +28,7 @@ namespace Bit.Portal.Models } // Inject service and create static lists - BuildLists(i18nService); + TranslateStrings(i18nService); if (model.Data != null) { @@ -55,6 +55,7 @@ namespace Bit.Portal.Models public PasswordGeneratorDataModel PasswordGeneratorDataModel { get; set; } public List Complexities { get; set; } public List DefaultTypes { get; set; } + public string EnableCheckboxText { get; set; } public Policy ToPolicy(PolicyType type, Guid organizationId) { @@ -93,7 +94,7 @@ namespace Bit.Portal.Models return existingPolicy; } - public void BuildLists(II18nService i18nService) + public void TranslateStrings(II18nService i18nService) { Complexities = new List { @@ -110,6 +111,8 @@ namespace Bit.Portal.Models new SelectListItem { Value = "password", Text = i18nService.T("Password") }, new SelectListItem { Value = "passphrase", Text = i18nService.T("Passphrase") }, }; + EnableCheckboxText = PolicyType == PolicyType.PersonalOwnership + ? i18nService.T("PersonalOwnershipCheckboxDesc") : i18nService.T("Enabled"); } } } diff --git a/bitwarden_license/src/Portal/Models/PolicyModel.cs b/bitwarden_license/src/Portal/Models/PolicyModel.cs index 1c365148ab..9ab6d11b93 100644 --- a/bitwarden_license/src/Portal/Models/PolicyModel.cs +++ b/bitwarden_license/src/Portal/Models/PolicyModel.cs @@ -58,7 +58,6 @@ namespace Bit.Portal.Models public string NameKey { get; set; } public string DescriptionKey { get; set; } public PolicyType PolicyType { get; set; } - [Display(Name = "Enabled")] public bool Enabled { get; set; } } } diff --git a/bitwarden_license/src/Portal/Views/Policies/Edit.cshtml b/bitwarden_license/src/Portal/Views/Policies/Edit.cshtml index 203e22c7a0..70c4971cf6 100644 --- a/bitwarden_license/src/Portal/Views/Policies/Edit.cshtml +++ b/bitwarden_license/src/Portal/Views/Policies/Edit.cshtml @@ -67,7 +67,7 @@
- +
diff --git a/src/Core/Resources/SharedResources.en.resx b/src/Core/Resources/SharedResources.en.resx index 09ffdad414..a3fd168568 100644 --- a/src/Core/Resources/SharedResources.en.resx +++ b/src/Core/Resources/SharedResources.en.resx @@ -581,4 +581,7 @@ You must manually disable the Single Sign-On Authentication policy before this policy can be disabled. + + Disable personal ownership for organization users +