Revert "[PM-6201] Fix creation of organizations no longer working aft…

…er merging #5130 (#5142)" This reverts commit 64573d0.
bitwarden · Dec 11, 2024 · b190426 · b190426
1 parent 64573d0
commit b190426
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/Admin/AdminConsole/Models/OrganizationsModel.cs b/src/Admin/AdminConsole/Models/OrganizationsModel.cs
@@ -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;
 }
diff --git a/src/Admin/AdminConsole/Views/Organizations/Index.cshtml b/src/Admin/AdminConsole/Views/Organizations/Index.cshtml
@@ -81,7 +81,8 @@
                                     <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>
+                            <i class="fa fa-hdd-o fa-lg fa-fw"
+                               title="Used Storage, @org.StorageGb GB"></i>
                             @if(org.Enabled)
                             {
                                 <i class="fa fa-check-circle fa-lg fa-fw"

diff --git a/src/Core/AdminConsole/Entities/Organization.cs b/src/Core/AdminConsole/Entities/Organization.cs
@@ -181,6 +181,11 @@ public string SubscriberType()
 
     public bool IsExpired() => ExpirationDate.HasValue && ExpirationDate.Value <= DateTime.UtcNow;
 
+    /// <summary>
+    /// Used storage in gigabytes.
+    /// </summary>
+    public double StorageGb => Storage.HasValue ? Math.Round(Storage.Value / 1073741824D, 2) : 0;
+
     public long StorageBytesRemaining()
     {
         if (!MaxStorageGb.HasValue)