some hamlet versions do not support nested tuples

This commit is contained in:
Joey Hess 2013-03-14 15:28:11 -04:00
parent 2bd2703eab
commit bac84ecbcd
3 changed files with 6 additions and 5 deletions

View file

@ -118,8 +118,8 @@ repoListDisplay reposelector = do
where where
ident = "repolist" ident = "repolist"
-- (num, name, (uuid, actions)) -- (num, name, uuid, actions)
type RepoList = [(String, String, (UUID, Actions))] type RepoList = [(String, String, UUID, Actions)]
{- A numbered list of known repositories, {- A numbered list of known repositories,
- with actions that can be taken on them. -} - with actions that can be taken on them. -}
@ -179,10 +179,11 @@ repoList reposelector
val iscloud r = Just (iscloud, (u, DisabledRepoActions $ r u)) val iscloud r = Just (iscloud, (u, DisabledRepoActions $ r u))
list l = liftAnnex $ do list l = liftAnnex $ do
let l' = nubBy (\x y -> fst x == fst y) l let l' = nubBy (\x y -> fst x == fst y) l
zip3 l'' <- zip3
<$> pure counter <$> pure counter
<*> Remote.prettyListUUIDs (map fst l') <*> Remote.prettyListUUIDs (map fst l')
<*> pure l' <*> pure l'
return $ map (\(num, name, (uuid, actions)) -> (num, name, uuid, actions)) l''
counter = map show ([1..] :: [Int]) counter = map show ([1..] :: [Int])
getEnableSyncR :: UUID -> Handler () getEnableSyncR :: UUID -> Handler ()

View file

@ -13,7 +13,7 @@
\ with these repositories: \ with these repositories:
<table .table .table-striped .table-condensed> <table .table .table-striped .table-condensed>
<tbody> <tbody>
$forall (num, name, _) <- repolist $forall (num, name, _, _) <- repolist
<tr> <tr>
<td> <td>
#{num} #{num}

View file

@ -11,7 +11,7 @@
Repositories Repositories
<table .table .table-condensed> <table .table .table-condensed>
<tbody #costsortable> <tbody #costsortable>
$forall (_num, name, (uuid, actions)) <- repolist $forall (_num, name, uuid, actions) <- repolist
<tr .repoline ##{"costsortable_" ++ fromUUID uuid}> <tr .repoline ##{"costsortable_" ++ fromUUID uuid}>
<td .handle> <td .handle>
<i .icon-resize-vertical></i> <i .icon-resize-vertical></i>