Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-01-02 18:47:44 +01:00
Code Issues Projects Releases Wiki Activity

Revert [PM-6201] (#5143)

Browse Source 
* Revert "[PM-6201] Fix creation of organizations no longer working after merging #5130 (#5142)"

This reverts commit 64573d01a3.

* Revert "[PM-6201] Self-Host Admin Portal is reporting "10239 GB of Additional… (#5130)"

This reverts commit 674e522843.
This commit is contained in:
Jonas Hendrickx 2024-12-11 15:19:38 +01:00 committed by GitHub
parent 64573d01a3
commit c99b4106f5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Admin/AdminConsole/Models/OrganizationsModel.cs
View File

@ -10,6 +10,4 @@ public class OrganizationsModel : PagedModel<Organization>
public bool? Paid { get; set; }
public string Action { get; set; }
public bool SelfHosted { get; set; }
public double StorageGB(Organization org) => org.Storage.HasValue ? Math.Round(org.Storage.Value / 1073741824D, 2) : 0;
}

11
src/Admin/AdminConsole/Views/Organizations/Index.cshtml
View File

@ -81,7 +81,16 @@
<i class="fa fa-smile-o fa-lg fa-fw text-body-secondary" title="Freeloader"></i>
}
}
<i class="fa fa-hdd-o fa-lg fa-fw" title="Used Storage, @Model.StorageGB(org) GB"></i>
@if(org.MaxStorageGb.HasValue && org.MaxStorageGb > 1)
{
<i class="fa fa-plus-square fa-lg fa-fw"
title="Additional Storage, @(org.MaxStorageGb - 1) GB"></i>
}
else
{
<i class="fa fa-plus-square-o fa-lg fa-fw text-body-secondary"
title="No Additional Storage"></i>
}
@if(org.Enabled)
{
<i class="fa fa-check-circle fa-lg fa-fw"