From 8669559928d09d90034b2b63c30d42f3ec5f0323 Mon Sep 17 00:00:00 2001
From: Jonas Hendrickx <jhendrickx@bitwarden.com>
Date: Wed, 11 Dec 2024 13:32:59 +0100
Subject: [PATCH] [PM-6201] Fix creation of organizations no longer working
 after merging #5130

---
 src/Admin/AdminConsole/Models/OrganizationsModel.cs     | 2 ++
 src/Admin/AdminConsole/Views/Organizations/Index.cshtml | 3 +--
 src/Core/AdminConsole/Entities/Organization.cs          | 5 -----
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/Admin/AdminConsole/Models/OrganizationsModel.cs b/src/Admin/AdminConsole/Models/OrganizationsModel.cs
index 147c5275f837..a98985ef015a 100644
--- a/src/Admin/AdminConsole/Models/OrganizationsModel.cs
+++ b/src/Admin/AdminConsole/Models/OrganizationsModel.cs
@@ -10,4 +10,6 @@ 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
index 3dc6801490c8..d42d0e8aa206 100644
--- a/src/Admin/AdminConsole/Views/Organizations/Index.cshtml
+++ b/src/Admin/AdminConsole/Views/Organizations/Index.cshtml
@@ -81,8 +81,7 @@
                                     <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, @org.StorageGb GB"></i>
+                            <i class="fa fa-hdd-o fa-lg fa-fw" title="Used Storage, @Model.StorageGB(org) 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
index 0676bcc8a83d..37e21d7f579f 100644
--- a/src/Core/AdminConsole/Entities/Organization.cs
+++ b/src/Core/AdminConsole/Entities/Organization.cs
@@ -181,11 +181,6 @@ 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)