From 76a229620d745d1de578d658e4760d6e768078fe Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Sat, 10 May 2025 12:43:33 -0400
Subject: [PATCH] allow staff to un-assign conditional roles that have been
 erroneously assigned (such as by changing a role type)

---
 packages/frontend/src/pages/admin-user.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/pages/admin-user.vue b/packages/frontend/src/pages/admin-user.vue
index 97e19629a7..a9e0e1031c 100644
--- a/packages/frontend/src/pages/admin-user.vue
+++ b/packages/frontend/src/pages/admin-user.vue
@@ -169,7 +169,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 							<i v-if="!expandedRoles.includes(role.id)" class="ti ti-chevron-down"></i>
 							<i v-if="expandedRoles.includes(role.id)" class="ti ti-chevron-left"></i>
 						</button>
-						<button v-if="role.target === 'manual'" class="_button" :class="$style.roleUnassign" @click="unassignRole(role, $event)"><i class="ti ti-x"></i></button>
+						<button v-if="role.target === 'manual' || info.roleAssigns.some(a => a.roleId === role.id)" class="_button" :class="$style.roleUnassign" @click="unassignRole(role, $event)"><i class="ti ti-x"></i></button>
 						<button v-else class="_button" :class="$style.roleUnassign" disabled><i class="ti ti-ban"></i></button>
 					</div>
 					<div v-if="expandedRoles.includes(role.id)" :class="$style.roleItemSub">