Skip to content

Commit 9cd7b4e

Browse files
fix: remove delete from cs/billing and create new RequestDelete perm, refs PM-17014
1 parent 72bb06a commit 9cd7b4e

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

src/Admin/AdminConsole/Views/Organizations/Edit.cshtml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
var canViewOrganizationInformation = AccessControlService.UserHasPermission(Permission.Org_OrgInformation_View);
1111
var canViewBillingInformation = AccessControlService.UserHasPermission(Permission.Org_BillingInformation_View);
1212
var canInitiateTrial = AccessControlService.UserHasPermission(Permission.Org_InitiateTrial);
13+
var canRequestDelete = AccessControlService.UserHasPermission(Permission.Org_RequestDelete);
1314
var canDelete = AccessControlService.UserHasPermission(Permission.Org_Delete);
1415
var canUnlinkFromProvider = AccessControlService.UserHasPermission(Permission.Provider_Edit);
1516
}
@@ -120,12 +121,15 @@
120121
Unlink provider
121122
</button>
122123
}
123-
@if (canDelete)
124+
@if (canRequestDelete)
124125
{
125126
<form asp-action="DeleteInitiation" asp-route-id="@Model.Organization.Id" id="initiate-delete-form">
126127
<input type="hidden" name="AdminEmail" id="AdminEmail" />
127128
<button class="btn btn-danger me-2" type="submit">Request Delete</button>
128129
</form>
130+
}
131+
@if (canDelete)
132+
{
129133
<form asp-action="Delete" asp-route-id="@Model.Organization.Id"
130134
onsubmit="return confirm('Are you sure you want to hard delete this organization?')">
131135
<button class="btn btn-outline-danger" type="submit">Delete</button>

src/Admin/Enums/Permissions.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public enum Permission
2424
Org_CheckEnabledBox,
2525
Org_BusinessInformation_View,
2626
Org_InitiateTrial,
27+
Org_RequestDelete,
2728
Org_Delete,
2829
Org_BillingInformation_View,
2930
Org_BillingInformation_DownloadInvoice,

src/Admin/Utilities/RolePermissionMapping.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ public static class RolePermissionMapping
3030
Permission.Org_BusinessInformation_View,
3131
Permission.Org_InitiateTrial,
3232
Permission.Org_Delete,
33+
Permission.Org_RequestDelete,
3334
Permission.Org_BillingInformation_View,
3435
Permission.Org_BillingInformation_DownloadInvoice,
3536
Permission.Org_Plan_View,
@@ -74,6 +75,7 @@ public static class RolePermissionMapping
7475
Permission.Org_GeneralDetails_View,
7576
Permission.Org_BusinessInformation_View,
7677
Permission.Org_Delete,
78+
Permission.Org_RequestDelete,
7779
Permission.Org_BillingInformation_View,
7880
Permission.Org_BillingInformation_DownloadInvoice,
7981
Permission.Org_BillingInformation_CreateEditTransaction,
@@ -114,7 +116,6 @@ public static class RolePermissionMapping
114116
Permission.User_Billing_LaunchGateway,
115117
Permission.Org_List_View,
116118
Permission.Org_OrgInformation_View,
117-
Permission.Org_Delete,
118119
Permission.Org_GeneralDetails_View,
119120
Permission.Org_BusinessInformation_View,
120121
Permission.Org_BillingInformation_View,
@@ -124,6 +125,7 @@ public static class RolePermissionMapping
124125
Permission.Org_Licensing_View,
125126
Permission.Org_Billing_View,
126127
Permission.Org_Billing_LaunchGateway,
128+
Permission.Org_RequestDelete,
127129
Permission.Provider_List_View,
128130
Permission.Provider_View
129131
}
@@ -157,7 +159,7 @@ public static class RolePermissionMapping
157159
Permission.Org_Billing_View,
158160
Permission.Org_Billing_Edit,
159161
Permission.Org_Billing_LaunchGateway,
160-
Permission.Org_Delete,
162+
Permission.Org_RequestDelete,
161163
Permission.Provider_Edit,
162164
Permission.Provider_View,
163165
Permission.Provider_List_View,

0 commit comments

Comments
 (0)