From 0dfb6dd75b184bd42d0da22e309774d86ebaf6d3 Mon Sep 17 00:00:00 2001
From: Rui Tome <rtome@bitwarden.com>
Date: Wed, 12 Oct 2022 17:18:20 +0100
Subject: [PATCH] [EC-343] Added 'UseCustomPermissions' to Admin view

---
 src/Admin/Models/OrganizationEditModel.cs | 4 ++++
 src/Admin/Views/Organizations/Edit.cshtml | 8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/Admin/Models/OrganizationEditModel.cs b/src/Admin/Models/OrganizationEditModel.cs
index 4a6fdde5ee..ed172d6fd9 100644
--- a/src/Admin/Models/OrganizationEditModel.cs
+++ b/src/Admin/Models/OrganizationEditModel.cs
@@ -42,6 +42,7 @@ public class OrganizationEditModel : OrganizationViewModel
         UseResetPassword = org.UseResetPassword;
         SelfHost = org.SelfHost;
         UsersGetPremium = org.UsersGetPremium;
+        UseCustomPermissions = org.UseCustomPermissions;
         MaxStorageGb = org.MaxStorageGb;
         Gateway = org.Gateway;
         GatewayCustomerId = org.GatewayCustomerId;
@@ -101,6 +102,8 @@ public class OrganizationEditModel : OrganizationViewModel
     public bool SelfHost { get; set; }
     [Display(Name = "Users Get Premium")]
     public bool UsersGetPremium { get; set; }
+    [Display(Name = "Custom Permissions")]
+    public bool UseCustomPermissions { get; set; }
     [Display(Name = "Max. Storage GB")]
     public short? MaxStorageGb { get; set; }
     [Display(Name = "Gateway")]
@@ -139,6 +142,7 @@ public class OrganizationEditModel : OrganizationViewModel
         existingOrganization.UseResetPassword = UseResetPassword;
         existingOrganization.SelfHost = SelfHost;
         existingOrganization.UsersGetPremium = UsersGetPremium;
+        existingOrganization.UseCustomPermissions = UseCustomPermissions;
         existingOrganization.MaxStorageGb = MaxStorageGb;
         existingOrganization.Gateway = Gateway;
         existingOrganization.GatewayCustomerId = GatewayCustomerId;
diff --git a/src/Admin/Views/Organizations/Edit.cshtml b/src/Admin/Views/Organizations/Edit.cshtml
index 10b42484bd..ba7ec84f93 100644
--- a/src/Admin/Views/Organizations/Edit.cshtml
+++ b/src/Admin/Views/Organizations/Edit.cshtml
@@ -27,6 +27,7 @@
                 document.getElementById('@(nameof(Model.UseDirectory))').checked = true;
                 document.getElementById('@(nameof(Model.UseEvents))').checked = true;
                 document.getElementById('@(nameof(Model.UsersGetPremium))').checked = true;
+                document.getElementById('@(nameof(Model.UseCustomPermissions))').checked = true;                
                 document.getElementById('@(nameof(Model.UseTotp))').checked = true;
                 document.getElementById('@(nameof(Model.Use2fa))').checked = true;
                 document.getElementById('@(nameof(Model.UseApi))').checked = true;
@@ -61,6 +62,7 @@
                 document.getElementById('@(nameof(Model.UseDirectory))').checked = true;
                 document.getElementById('@(nameof(Model.UseEvents))').checked = true;
                 document.getElementById('@(nameof(Model.UsersGetPremium))').checked = true;
+                document.getElementById('@(nameof(Model.UseCustomPermissions))').checked = true;
                 document.getElementById('@(nameof(Model.UseTotp))').checked = true;
                 document.getElementById('@(nameof(Model.Use2fa))').checked = true;
                 document.getElementById('@(nameof(Model.UseApi))').checked = true;
@@ -237,10 +239,14 @@
         <input type="checkbox" class="form-check-input" asp-for="UseResetPassword">
         <label class="form-check-label" asp-for="UseResetPassword"></label>
     </div>
-    <div class="form-check mb-3">
+    <div class="form-check">
         <input type="checkbox" class="form-check-input" asp-for="UsersGetPremium">
         <label class="form-check-label" asp-for="UsersGetPremium"></label>
     </div>
+    <div class="form-check mb-3">
+        <input type="checkbox" class="form-check-input" asp-for="UseCustomPermissions">
+        <label class="form-check-label" asp-for="UseCustomPermissions"></label>
+    </div>
     <h2>Licensing</h2>
     <div class="row">
         <div class="col-sm">