From ccb1278bd1dc0eeec4eeb74f004ee97ba54003b1 Mon Sep 17 00:00:00 2001 From: nek0 Date: Thu, 16 Apr 2015 03:12:05 +0200 Subject: [PATCH] avatar deletion now possible --- Handler/Avatar.hs | 13 ++++++++++++- config/routes | 1 + messages/cz.msg | 10 ++++++++++ messages/de.msg | 4 +++- messages/en.msg | 10 ++++++++++ templates/modifyAvatar.hamlet | 2 ++ 6 files changed, 38 insertions(+), 2 deletions(-) diff --git a/Handler/Avatar.hs b/Handler/Avatar.hs index e8178da..ebfaa92 100644 --- a/Handler/Avatar.hs +++ b/Handler/Avatar.hs @@ -1,7 +1,6 @@ module Handler.Avatar where import Import -import Data.Conduit import Data.Conduit.Binary import qualified Data.ByteString as B import qualified Data.ByteString.Lazy as L @@ -113,3 +112,15 @@ getGetAvatarR :: AvatarId -> Handler TypedContent getGetAvatarR aId = do avatar <- runDB $ get404 aId return $ TypedContent typePng $ toContent $ avatarData avatar + +getAvatarDeleteR :: AvatarId -> Handler Html +getAvatarDeleteR aId = do + ma <- runDB $ get aId + case ma of + Just _ -> do + runDB $ delete aId + setMessageI MsgAvatarDeleted + redirect $ HomeR + Nothing -> do + setMessageI MsgAvatarUnknown + redirect $ AvatarR diff --git a/config/routes b/config/routes index dcabcfc..bdf8cc7 100644 --- a/config/routes +++ b/config/routes @@ -28,4 +28,5 @@ /avatars AvatarR GET /avatar/#AvatarId GetAvatarR GET /avatar/#AvatarId/modify ModifyAvatarR GET POST +/avatar/#AvatarId/delete AvatarDeleteR GET /newavatar NewAvatarR GET POST diff --git a/messages/cz.msg b/messages/cz.msg index abadd22..43dda45 100644 --- a/messages/cz.msg +++ b/messages/cz.msg @@ -84,5 +84,15 @@ NegativeRecharge: Nelze nabít negativní obnos Increment: ++ Decrement: -- SelectAvatar: Vyber avatar +Avatars: Avatary NoAvatars: žádné avatary ModifyAvatar: Modify avatar +AvatarUnknown: Avatar neznámý +AvatarUpdateSuccessfull: Aktualizace avataru se zdařila +AvatarIdent: Jméno avataru +AvatarFileChange: Zadej soubor k změnně avataru +AvatarFile: Soubor avataru +NewAvatar: Nový avatar +AvatarUploadSuccessfull: Avatar úspěšně nahrán +DeleteAvatar: Smazat avatar +AvatarDeleted: Avatar úspěšně smazán diff --git a/messages/de.msg b/messages/de.msg index 8106443..99a7ccd 100644 --- a/messages/de.msg +++ b/messages/de.msg @@ -89,8 +89,10 @@ NoAvatars: Keine Avatare ModifyAvatar: Avatar bearbeiten AvatarUnknown: Unbekannter Avatar AvatarUpdateSuccessfull: Avatar erfolgreich aktualisiert -AvatarIdent: Avtarname +AvatarIdent: Avatarname AvatarFileChange: Datei auswählen um Avatar zu ändern AvatarFile: Datei für den Avatar NewAvatar: Neuer Avatar AvatarUploadSuccessfull: Avatar erfolgreich hochgeladen +DeleteAvatar: Diesen Avatar löschen +AvatarDeleted: Avatar gelöscht diff --git a/messages/en.msg b/messages/en.msg index f6f02fa..3ddb6ad 100644 --- a/messages/en.msg +++ b/messages/en.msg @@ -84,5 +84,15 @@ NegativeRecharge: You can not recharge negative amounts Increment: ++ Decrement: -- SelectAvatar: Select avatar +Avatars: Avatars NoAvatars: No avatars ModifyAvatar: Modify avatar +AvatarUnknown: Avatar unknown +AvatarUpdateSuccessfull: Avatar update successfull +AvatarIdent: Avatar name +AvatarFileChange: Enter file to change this avatar +AvatarFile: Avatar file +NewAvatar: New avatar +AvatarUploadSuccessfull: Avatar upload successfull +DeleteAvatar: Delete avatar +AvatarDeleted: Avatar successfully deleted diff --git a/templates/modifyAvatar.hamlet b/templates/modifyAvatar.hamlet index 28a9716..ace4588 100644 --- a/templates/modifyAvatar.hamlet +++ b/templates/modifyAvatar.hamlet @@ -6,3 +6,5 @@ $doctype 5 ^{avatarModifyWidget}
+ +_{MsgDeleteAvatar}