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

stop abusing UltDest here, just get Referer header by hand

Browse source
This commit is contained in:
Joey Hess 2013-03-16 19:00:11 -04:00
parent 140774a8c8
commit 4c0642a70d
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Assistant/WebApp.hs
View file

@ -18,6 +18,9 @@ import Utility.Yesod
import Yesod import Yesod
import Data.Text (Text) import Data.Text (Text)
import Control.Concurrent import Control.Concurrent
import qualified Network.Wai as W
import qualified Data.ByteString.Char8 as S8
import qualified Data.Text as T
waitNotifier :: forall sub. (Assistant NotificationBroadcaster) -> NotificationId -> GHandler sub WebApp () waitNotifier :: forall sub. (Assistant NotificationBroadcaster) -> NotificationId -> GHandler sub WebApp ()
waitNotifier getbroadcaster nid = liftAssistant $ do waitNotifier getbroadcaster nid = liftAssistant $ do
@ -65,6 +68,7 @@ renderUrl urlrenderer route params = do
{- Redirects back to the referring page, or if there's none, DashboardR -} {- Redirects back to the referring page, or if there's none, DashboardR -}
redirectBack :: Handler () redirectBack :: Handler ()
redirectBack = do redirectBack = do
clearUltDest mr <- lookup "referer" . W.requestHeaders <$> waiRequest
setUltDestReferer case mr of
redirectUltDest DashboardR Nothing -> redirect DashboardR
Just r -> redirect $ T.pack $ S8.unpack r