diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-10-14 14:51:11 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-10-14 14:51:11 -0400 |
| commit | 1c42979918649797c239e0441ccf531ebde430eb (patch) | |
| tree | 3a89da52dc6ef2c6a7084c5509bfd0d04e0ddf96 | |
| parent | 83c8c3104583d6fea4c44751b39191b1f4af443f (diff) | |
fix display of transfers for remotes not in syncRemotes list
| -rw-r--r-- | Assistant/Threads/TransferWatcher.hs | 4 | ||||
| -rw-r--r-- | doc/design/assistant/webapp.mdwn | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/Assistant/Threads/TransferWatcher.hs b/Assistant/Threads/TransferWatcher.hs index 95a594d5d..a54128cb6 100644 --- a/Assistant/Threads/TransferWatcher.hs +++ b/Assistant/Threads/TransferWatcher.hs @@ -67,8 +67,8 @@ onAdd st dstatus _ file _ = case parseTransferFile file of [ "transfer starting:" , show t ] - r <- headMaybe . filter (sameuuid t) . syncRemotes - <$> getDaemonStatus dstatus + r <- headMaybe . filter (sameuuid t) + <$> runThreadState st Remote.remoteList updateTransferInfo dstatus t info { transferRemote = r } sameuuid t r = Remote.uuid r == transferUUID t diff --git a/doc/design/assistant/webapp.mdwn b/doc/design/assistant/webapp.mdwn index 106e7b1f6..a5a970fd1 100644 --- a/doc/design/assistant/webapp.mdwn +++ b/doc/design/assistant/webapp.mdwn @@ -8,9 +8,6 @@ The webapp is a web server that displays a shiny interface. This is quite likely because of how the div containing transfers is refereshed. If instead javascript was used to update the progress bar etc for transfers with json data, the buttons would work better. -* Transfers from a remote with syncing disabled show as from "unknown". - (Note that it's probably not practical to prevent a remote with syncing - disabled from initiating transfers, so this can happen.) ## interface |