webapp: Fixed drag and drop to reorder the list of remotes.
Broken by 958312885f
, in November!
I missed this because there's no strong type checking across the AJAX call. :(
Need to switch to Fay to avoid such bugs..
This commit is contained in:
parent
05a30f6321
commit
1a40a66d72
2 changed files with 4 additions and 3 deletions
|
@ -223,17 +223,17 @@ getRepositoriesReorderR = do
|
|||
{- Get uuid of the moved item, and the list it was moved within. -}
|
||||
moved <- fromjs <$> runInputGet (ireq textField "moved")
|
||||
list <- map fromjs <$> lookupGetParams "list[]"
|
||||
liftAnnex $ go list =<< Remote.remoteFromUUID moved
|
||||
liftAnnex $ go list =<< repoIdRemote moved
|
||||
liftAssistant updateSyncRemotes
|
||||
where
|
||||
go _ Nothing = noop
|
||||
go list (Just remote) = do
|
||||
rs <- catMaybes <$> mapM Remote.remoteFromUUID list
|
||||
rs <- catMaybes <$> mapM repoIdRemote list
|
||||
forM_ (reorderCosts remote rs) $ \(r, newcost) ->
|
||||
when (Remote.cost r /= newcost) $
|
||||
setRemoteCost (Remote.repo r) newcost
|
||||
void remoteListRefresh
|
||||
fromjs = toUUID . T.unpack
|
||||
fromjs = fromMaybe (RepoUUID NoUUID) . readish . T.unpack
|
||||
|
||||
reorderCosts :: Remote -> [Remote] -> [(Remote, Cost)]
|
||||
reorderCosts remote rs = zip rs'' (insertCostAfter costs i)
|
||||
|
|
1
debian/changelog
vendored
1
debian/changelog
vendored
|
@ -11,6 +11,7 @@ git-annex (5.20140422) UNRELEASED; urgency=medium
|
|||
fail when the assistant is run with no controlling tty.
|
||||
* Added ddar special remote.
|
||||
Thanks, Robie Basak.
|
||||
* webapp: Fixed drag and drop to reorder the list of remotes.
|
||||
|
||||
-- Joey Hess <joeyh@debian.org> Fri, 02 May 2014 15:28:53 -0300
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue