mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'assistant' into assistant-longpolling-rewrite

Browse source
This commit is contained in:
Joey Hess 2012-07-30 18:19:24 -04:00
commit 2e54a611c7
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Assistant/Threads/WebApp.hs
View file

@ -164,11 +164,9 @@ transfersDisplay warnNoScript = do
if null transfers
then ifM (lift $ showIntro <$> getWebAppState)
( introDisplay ident
, noop
, $(widgetFile "transfers")
)
else do
lift $ modifyWebAppState $ \s -> s { showIntro = False }
$(widgetFile "transfers")
else $(widgetFile "transfers")
transfersDisplayIdent :: Text
transfersDisplayIdent = "transfers"
@ -189,6 +187,7 @@ introDisplay ident = do
let barelyenough = n == 2
let morethanenough = n > 2
$(widgetFile "intro")
lift $ modifyWebAppState $ \s -> s { showIntro = False }
where
counter = map show ([1..] :: [Int])