delete admin user fixed

This commit is contained in:
zurdi
2023-08-18 12:35:27 +02:00
parent 5f598443eb
commit 2bc3fbf864
3 changed files with 21 additions and 4 deletions

View File

@@ -7,7 +7,7 @@ from sqlalchemy.exc import ProgrammingError
from logger.logger import log
from config.config_loader import ConfigLoader
from models import Platform, Rom, User
from models import Platform, Rom, User, Role
class DBHandler:
@@ -184,3 +184,10 @@ class DBHandler:
return session.scalars(select(User)).all()
except ProgrammingError as e:
self.raise_error(e)
def get_admin_users(self):
try:
with self.session.begin() as session:
return session.scalars(select(User).filter_by(role=Role.ADMIN)).all()
except ProgrammingError as e:
self.raise_error(e)

View File

@@ -1,3 +1,3 @@
from .platform import Platform # noqa[401]
from .rom import Rom # noqa[401]
from .user import User # noqa[401]
from .user import User, Role # noqa[401]

View File

@@ -13,7 +13,15 @@ emitter.on("showDeleteUserDialog", (userToDelete) => {
});
async function deleteUser() {
await deleteUserApi(user.value);
await deleteUserApi(user.value).catch(({ response, message }) => {
emitter.emit("snackbarShow", {
msg: `Unable to delete user: ${
response?.data?.detail || response?.statusText || message
}`,
icon: "mdi-close-circle",
color: "red",
});
});
show.value = false;
}
</script>
@@ -47,7 +55,9 @@ async function deleteUser() {
</v-row>
<v-row class="justify-center pa-2" no-gutters>
<v-btn @click="show = false" class="bg-terciary">Cancel</v-btn>
<v-btn class="bg-terciary text-rommRed ml-5" @click="deleteUser()">Confirm</v-btn>
<v-btn class="bg-terciary text-rommRed ml-5" @click="deleteUser()"
>Confirm</v-btn
>
</v-row>
</v-card-text>
</v-card>