Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2024-12-01 13:43:23 +01:00
Code Issues Projects Releases Wiki Activity

Removed business name from org edit (#3970)

Browse Source
This commit is contained in:
Conner Turnbull 2024-04-12 10:17:34 -04:00 committed by GitHub
parent 66f0c4b982
commit 6d2b47f036
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Admin/AdminConsole/Models/OrganizationEditModel.cs
View File

@ -38,7 +38,6 @@ public class OrganizationEditModel : OrganizationViewModel
BraintreeMerchantId = globalSettings.Braintree.MerchantId; BraintreeMerchantId = globalSettings.Braintree.MerchantId;
Name = org.DisplayName(); Name = org.DisplayName();
BusinessName = org.DisplayBusinessName();
BillingEmail = provider?.Type == ProviderType.Reseller ? provider.BillingEmail : org.BillingEmail; BillingEmail = provider?.Type == ProviderType.Reseller ? provider.BillingEmail : org.BillingEmail;
PlanType = org.PlanType; PlanType = org.PlanType;
Plan = org.Plan; Plan = org.Plan;
@ -81,8 +80,6 @@ public class OrganizationEditModel : OrganizationViewModel
[Required] [Required]
[Display(Name = "Organization Name")] [Display(Name = "Organization Name")]
public string Name { get; set; } public string Name { get; set; }
[Display(Name = "Business Name")]
public string BusinessName { get; set; }
[Display(Name = "Billing Email")] [Display(Name = "Billing Email")]
public string BillingEmail { get; set; } public string BillingEmail { get; set; }
[Required] [Required]
@ -186,7 +183,6 @@ public class OrganizationEditModel : OrganizationViewModel
public Organization ToOrganization(Organization existingOrganization) public Organization ToOrganization(Organization existingOrganization)
{ {
existingOrganization.Name = WebUtility.HtmlEncode(Name.Trim()); existingOrganization.Name = WebUtility.HtmlEncode(Name.Trim());
existingOrganization.BusinessName = WebUtility.HtmlEncode(BusinessName.Trim());
existingOrganization.BillingEmail = BillingEmail?.ToLowerInvariant()?.Trim(); existingOrganization.BillingEmail = BillingEmail?.ToLowerInvariant()?.Trim();
existingOrganization.PlanType = PlanType.Value; existingOrganization.PlanType = PlanType.Value;
existingOrganization.Plan = Plan; existingOrganization.Plan = Plan;

14
src/Admin/AdminConsole/Views/Shared/_OrganizationForm.cshtml
View File

@ -9,7 +9,6 @@
@{ @{
var canViewGeneralDetails = AccessControlService.UserHasPermission(Permission.Org_GeneralDetails_View); var canViewGeneralDetails = AccessControlService.UserHasPermission(Permission.Org_GeneralDetails_View);
var canViewBilling = AccessControlService.UserHasPermission(Permission.Org_Billing_View); var canViewBilling = AccessControlService.UserHasPermission(Permission.Org_Billing_View);
var canViewBusinessInformation = AccessControlService.UserHasPermission(Permission.Org_BusinessInformation_View);
var canViewPlan = AccessControlService.UserHasPermission(Permission.Org_Plan_View); var canViewPlan = AccessControlService.UserHasPermission(Permission.Org_Plan_View);
var canViewLicensing = AccessControlService.UserHasPermission(Permission.Org_Licensing_View); var canViewLicensing = AccessControlService.UserHasPermission(Permission.Org_Licensing_View);
var canCheckEnabled = AccessControlService.UserHasPermission(Permission.Org_CheckEnabledBox); var canCheckEnabled = AccessControlService.UserHasPermission(Permission.Org_CheckEnabledBox);
@ -61,19 +60,6 @@
} }
} }
@if (canViewBusinessInformation)
{
<h2>Business Information</h2>
<div class="row">
<div class="col-sm">
<div class="form-group">
<label asp-for="BusinessName"></label>
<input type="text" class="form-control" asp-for="BusinessName" value="@Model.BusinessName">
</div>
</div>
</div>
}
@if (canViewPlan) @if (canViewPlan)
{ {
<h2>Plan</h2> <h2>Plan</h2>