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

remove workaround for old yesod bug

Browse source
This commit is contained in:
Joey Hess 2013-09-27 00:31:12 -04:00
parent 7665773593
commit 1f5611a1ca
4 changed files with 4 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Assistant/WebApp/Configurators/Local.hs
View file

@ -196,8 +196,8 @@ postNewRepositoryR = page "Add another repository" (Just Configuration) $ do
mainrepo <- fromJust . relDir <$> liftH getYesod mainrepo <- fromJust . relDir <$> liftH getYesod
$(widgetFile "configurators/newrepository/combine") $(widgetFile "configurators/newrepository/combine")
getCombineRepositoryR :: FilePathAndUUID -> Handler Html getCombineRepositoryR :: FilePath -> UUID -> Handler Html
getCombineRepositoryR (FilePathAndUUID newrepopath newrepouuid) = do getCombineRepositoryR newrepopath newrepouuid = do
r <- combineRepos newrepopath remotename r <- combineRepos newrepopath remotename
liftAssistant $ syncRemote r liftAssistant $ syncRemote r
redirect $ EditRepositoryR newrepouuid redirect $ EditRepositoryR newrepouuid

9
Assistant/WebApp/Types.hs
View file

@ -163,15 +163,6 @@ data RemovableDrive = RemovableDrive
data RepoKey = RepoKey KeyId | NoRepoKey data RepoKey = RepoKey KeyId | NoRepoKey
deriving (Read, Show, Eq, Ord) deriving (Read, Show, Eq, Ord)
{- Only needed to work around old-yesod bug that emits a warning message
- when a route has two parameters. -}
data FilePathAndUUID = FilePathAndUUID FilePath UUID
deriving (Read, Show, Eq)
instance PathPiece FilePathAndUUID where
toPathPiece = pack . show
fromPathPiece = readish . unpack
instance PathPiece RemovableDrive where instance PathPiece RemovableDrive where
toPathPiece = pack . show toPathPiece = pack . show
fromPathPiece = readish . unpack fromPathPiece = readish . unpack

2
Assistant/WebApp/routes
View file

@ -26,7 +26,7 @@
/config/repository/new/androidcamera AndroidCameraRepositoryR GET /config/repository/new/androidcamera AndroidCameraRepositoryR GET
/config/repository/switcher RepositorySwitcherR GET /config/repository/switcher RepositorySwitcherR GET
/config/repository/switchto/#FilePath SwitchToRepositoryR GET /config/repository/switchto/#FilePath SwitchToRepositoryR GET
/config/repository/combine/#FilePathAndUUID CombineRepositoryR GET /config/repository/combine/#FilePath/#UUID CombineRepositoryR GET
/config/repository/edit/#UUID EditRepositoryR GET POST /config/repository/edit/#UUID EditRepositoryR GET POST
/config/repository/edit/new/#UUID EditNewRepositoryR GET POST /config/repository/edit/new/#UUID EditNewRepositoryR GET POST
/config/repository/edit/new/cloud/#UUID EditNewCloudRepositoryR GET POST /config/repository/edit/new/cloud/#UUID EditNewCloudRepositoryR GET POST

2
templates/configurators/newrepository/combine.hamlet
View file

@ -6,7 +6,7 @@
<br> <br>
Do you want to combine it with your existing repository at #{mainrepo}? Do you want to combine it with your existing repository at #{mainrepo}?
<p> <p>
<a .btn href="@{CombineRepositoryR $ FilePathAndUUID newrepopath newrepouuid}"> <a .btn href="@{CombineRepositoryR newrepopath newrepouuid}">
<i .icon-resize-small></i> Combine the repositories # <i .icon-resize-small></i> Combine the repositories #
The combined repositories will sync and share their files. The combined repositories will sync and share their files.
<p> <p>