From b0e7bf4a56ae35b403e7e67767233e7803c92fa5 Mon Sep 17 00:00:00 2001 From: Dag Odenhall Date: Fri, 30 Mar 2012 02:32:18 +0200 Subject: [PATCH] huh, how did that happen --- src/Happaste/Html.hs | 6 +++--- src/Happaste/Routes.hs | 2 +- src/Happaste/State.hs | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Happaste/Html.hs b/src/Happaste/Html.hs index 47ed2ba..df353e2 100644 --- a/src/Happaste/Html.hs +++ b/src/Happaste/Html.hs @@ -69,9 +69,9 @@ unit size body = -recentPasteStateList :: XMLGenT Server (HSX.XML Server) -recentPasteStateList = do - { ps <- query RecentPasteState +recentPastesList :: XMLGenT Server (HSX.XML Server) +recentPastesList = do + { ps <- query RecentPastes ;
    <% forM ps $ \(k,p) ->
  1. <% p ^. fileName %>
  2. diff --git a/src/Happaste/Routes.hs b/src/Happaste/Routes.hs index 3f78e00..55bc8b2 100644 --- a/src/Happaste/Routes.hs +++ b/src/Happaste/Routes.hs @@ -63,7 +63,7 @@ route (NewPaste) = do %> - <% unit "7-24" recentPasteStateList %> + <% unit "7-24" recentPastesList %> Right paste -> do k <- update $ SavePaste paste diff --git a/src/Happaste/State.hs b/src/Happaste/State.hs index f74d4e3..a73de53 100644 --- a/src/Happaste/State.hs +++ b/src/Happaste/State.hs @@ -9,8 +9,8 @@ import Data.Text (Text) import Happaste.Types -recentPasteState :: Query PasteState [(Key,Paste)] -recentPasteState = pastes %. take 10 . toDescList (Proxy :: Proxy Key) +recentPastes :: Query PasteState [(Key,Paste)] +recentPastes = pastes %. take 10 . toDescList (Proxy :: Proxy Key) savePaste :: Paste -> Update PasteState Key savePaste p = do @@ -21,7 +21,7 @@ savePaste p = do getPaste :: Key -> Query PasteState (Maybe Paste) getPaste k = pastes %. fmap snd . getOne . getEQ k -makeAcidic ''PasteState ['recentPasteState, 'savePaste, 'getPaste] +makeAcidic ''PasteState ['recentPastes, 'savePaste, 'getPaste] saveHighlight :: Key -> Text -> Update HighlighterState Text saveHighlight k t = do