diff --git a/Handler/Avatar.hs b/Handler/Avatar.hs index ebfaa92..7a476a5 100644 --- a/Handler/Avatar.hs +++ b/Handler/Avatar.hs @@ -118,9 +118,15 @@ getAvatarDeleteR aId = do ma <- runDB $ get aId case ma of Just _ -> do - runDB $ delete aId - setMessageI MsgAvatarDeleted - redirect $ HomeR + c <- runDB $ selectList [UserAvatar ==. Just aId] [] + case null c of + True -> do + runDB $ delete aId + setMessageI MsgAvatarDeleted + redirect $ HomeR + False -> do + setMessageI MsgAvatarInUseError + redirect $ AvatarR Nothing -> do setMessageI MsgAvatarUnknown redirect $ AvatarR diff --git a/messages/cz.msg b/messages/cz.msg index 43dda45..f9fb8b5 100644 --- a/messages/cz.msg +++ b/messages/cz.msg @@ -96,3 +96,4 @@ NewAvatar: Nový avatar AvatarUploadSuccessfull: Avatar úspěšně nahrán DeleteAvatar: Smazat avatar AvatarDeleted: Avatar úspěšně smazán +AvatarInUseError: Avatar nelze smazat dokud je v užitku diff --git a/messages/de.msg b/messages/de.msg index 99a7ccd..c0d1560 100644 --- a/messages/de.msg +++ b/messages/de.msg @@ -96,3 +96,4 @@ NewAvatar: Neuer Avatar AvatarUploadSuccessfull: Avatar erfolgreich hochgeladen DeleteAvatar: Diesen Avatar löschen AvatarDeleted: Avatar gelöscht +AvatarInUseError: Avatare können nicht gelöscht werden, solange sie in Benutzung sind. diff --git a/messages/en.msg b/messages/en.msg index 3ddb6ad..1054db2 100644 --- a/messages/en.msg +++ b/messages/en.msg @@ -96,3 +96,4 @@ NewAvatar: New avatar AvatarUploadSuccessfull: Avatar upload successfull DeleteAvatar: Delete avatar AvatarDeleted: Avatar successfully deleted +AvatarInUseError: You can not delete avatars that are currently in use