diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-09-11 15:43:33 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-09-11 15:43:33 -0400 |
| commit | 99d52f26bc2efc12f936591ff980ac42f5de5ecf (patch) | |
| tree | 70b3691597c4b89e7d5e342e460e96eab1546eec /Assistant | |
| parent | 4227050bbe97df92e5f4a733b0521670c8fd67ba (diff) | |
fix combining of pairing alerts
Diffstat (limited to 'Assistant')
| -rw-r--r-- | Assistant/Alert.hs | 12 | ||||
| -rw-r--r-- | Assistant/Threads/PairListener.hs | 4 | ||||
| -rw-r--r-- | Assistant/WebApp/Configurators/Pairing.hs | 2 |
3 files changed, 8 insertions, 10 deletions
diff --git a/Assistant/Alert.hs b/Assistant/Alert.hs index 2a08c9ce0..fc1dff353 100644 --- a/Assistant/Alert.hs +++ b/Assistant/Alert.hs @@ -294,12 +294,8 @@ pairingAlert button = baseActivityAlert } pairRequestReceivedAlert :: String -> AlertButton -> Alert -pairRequestReceivedAlert repo button = Alert - { alertClass = Message - , alertHeader = Nothing - , alertMessageRender = tenseWords - , alertData = [UnTensed $ T.pack $ repo ++ " is sending a pair request."] - , alertBlockDisplay = False +pairRequestReceivedAlert repo button = baseActivityAlert + { alertData = [UnTensed $ T.pack $ repo ++ " is sending a pair request."] , alertPriority = High , alertClosable = True , alertIcon = Just InfoIcon @@ -308,13 +304,13 @@ pairRequestReceivedAlert repo button = Alert , alertButton = Just button } -pairRequestAcknowledgedAlert :: String -> AlertButton -> Alert +pairRequestAcknowledgedAlert :: String -> (Maybe AlertButton) -> Alert pairRequestAcknowledgedAlert repo button = baseActivityAlert { alertData = ["Pair request with", UnTensed (T.pack repo), Tensed "in progress" "complete"] , alertPriority = High , alertName = Just $ PairAlert repo , alertCombiner = Just $ dataCombiner $ \_old new -> new - , alertButton = Just button + , alertButton = button } fileAlert :: TenseChunk -> FilePath -> Alert diff --git a/Assistant/Threads/PairListener.hs b/Assistant/Threads/PairListener.hs index 14d189dd2..7f4368925 100644 --- a/Assistant/Threads/PairListener.hs +++ b/Assistant/Threads/PairListener.hs @@ -109,10 +109,12 @@ pairReqReceived False dstatus urlrenderer msg = do AlertButton { buttonUrl = url , buttonLabel = T.pack "Respond" - , buttonAction = Nothing + , buttonAction = Just onclick } where repo = pairRepo msg + onclick = \i -> updateAlert dstatus i $ const $ Just $ + pairRequestAcknowledgedAlert repo Nothing {- When a verified PairAck is seen, a host is ready to pair with us, and has - already configured our ssh key. Stop sending PairReqs, finish the pairing, diff --git a/Assistant/WebApp/Configurators/Pairing.hs b/Assistant/WebApp/Configurators/Pairing.hs index ddd9a97b7..1a80f1f75 100644 --- a/Assistant/WebApp/Configurators/Pairing.hs +++ b/Assistant/WebApp/Configurators/Pairing.hs @@ -56,7 +56,7 @@ getFinishPairR msg = promptSecret (Just msg) $ \_ secret -> do liftIO $ setup startPairing PairAck cleanup alert uuid "" secret where - alert = pairRequestAcknowledgedAlert $ pairRepo msg + alert = pairRequestAcknowledgedAlert (pairRepo msg) . Just setup = setupAuthorizedKeys msg cleanup = removeAuthorizedKeys False $ remoteSshPubKey $ pairMsgData msg |