Permalink
Browse files

Require filestore 0.5, use new limit param in history.

  • Loading branch information...
1 parent e3bf80a commit 3259876119fd7ab021922ee646b7b1b70e3ad909 John MacFarlane committed May 20, 2012
Showing with 5 additions and 5 deletions.
  1. +4 −4 Network/Gitit/Handlers.hs
  2. +1 −1 gitit.cabal
@@ -325,8 +325,8 @@ showFileHistory = withData $ \(params :: Params) -> do
showHistory :: String -> String -> Params -> Handler
showHistory file page params = do
fs <- getFileStore
- hist <- liftM (take (pLimit params)) $
- liftIO $ history fs [file] (TimeRange Nothing Nothing)
+ hist <- liftIO $ history fs [file] (TimeRange Nothing Nothing)
+ (Just $ pLimit params)
base' <- getWikiBase
let versionToHtml rev pos = li ! [theclass "difflink", intAttr "order" pos,
strAttr "revision" (revId rev),
@@ -384,8 +384,8 @@ showActivity = withData $ \(params :: Params) -> do
Just t -> Just t
let forUser = pForUser params
fs <- getFileStore
- hist <- liftIO $ (take (pLimit params)) `fmap`
- history fs [] (TimeRange since Nothing)
+ hist <- liftIO $ history fs [] (TimeRange since Nothing)
+ (Just $ pLimit params)
let hist' = case forUser of
Nothing -> hist
Just u -> filter (\r -> authorName (revAuthor r) == u) hist
View
@@ -154,7 +154,7 @@ Executable gitit
old-locale >= 1,
time >= 1.1 && < 1.5,
recaptcha >= 0.1,
- filestore >= 0.4.2 && < 0.5,
+ filestore >= 0.5 && < 0.6,
zlib >= 0.5 && < 0.6,
url >= 2.1 && < 2.2,
happstack-server >= 6.6 && < 7.1,

0 comments on commit 3259876

Please sign in to comment.