Fix Remove User Issue
- Added "Remove User" header in AdminMenu::removeUser for clarity. - Updated filterActiveUsers in MenuHelper.h to exclude ADMIN users from the active user list. Fixes #1742
This commit is contained in:
@@ -474,6 +474,7 @@ void AdminMenu::removeUser()
|
||||
auto listOfUsers = m_controller.getUsers();
|
||||
auto listOfActiveUsers = filterActiveUsers(listOfUsers);
|
||||
int activeUserCount = listOfActiveUsers.getSize();
|
||||
std::cout << "Remove User \n";
|
||||
if (activeUserCount < 1)
|
||||
{
|
||||
std::cout << "No Active users." << std::endl;
|
||||
|
||||
@@ -675,7 +675,7 @@ inline util::Map<std::string, const User*> filterActiveUsers(const util::Map<std
|
||||
for (int index = 0; index < inventorySize; index++)
|
||||
{
|
||||
const User* user = listOfUsers.getValueAt(index);
|
||||
if (user != nullptr && user->getState() != util::State::INACTIVE)
|
||||
if (user != nullptr && user->getState() != util::State::INACTIVE && user->getUserType() != util::UserType::ADMIN)
|
||||
{
|
||||
activeUsers.insert(user->getId(), user);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user