From aa325f7fa947fdc76467ae6c3002d0f3b7659956 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 19 Dec 2018 17:51:00 +0100 Subject: [PATCH] Due to HasRoute-refactor CourseNewTemplateR is no longer needed --- routes | 1 - src/Foundation.hs | 2 +- src/Handler/Course.hs | 9 --------- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/routes b/routes index 25d5bb346..c2a320731 100644 --- a/routes +++ b/routes @@ -60,7 +60,6 @@ -- For Pattern Synonyms see Foundation /course/ CourseListR GET !free !/course/new CourseNewR GET POST !lecturer -!/course/new/#{Maybe TermId}/#{Maybe SchoolId}/#{Maybe CourseShorthand} CourseNewTemplateR GET !lecturer /course/#TermId/#SchoolId/#CourseShorthand CourseR !lecturer: / CShowR GET !free /register CRegisterR POST !timeANDcapacity diff --git a/src/Foundation.hs b/src/Foundation.hs index 76af3794e..a84e7fb7a 100644 --- a/src/Foundation.hs +++ b/src/Foundation.hs @@ -1190,7 +1190,7 @@ pageActions (CourseR tid ssh csh CShowR) = { menuItemType = PageActionSecondary , menuItemLabel = MsgMenuCourseNewTemplate , menuItemIcon = Nothing - , menuItemRoute = SomeRoute $ CourseNewTemplateR (Just tid) (Just ssh) (Just csh) + , menuItemRoute = SomeRoute (CourseNewR, [("tid", toPathPiece tid), ("ssh", toPathPiece ssh), ("csh", toPathPiece csh)]) , menuItemModal = False , menuItemAccessCallback' = return True } diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs index cb0a05f25..0db760fe3 100644 --- a/src/Handler/Course.hs +++ b/src/Handler/Course.hs @@ -18,8 +18,6 @@ import Data.Maybe import qualified Data.Set as Set import qualified Data.Map as Map -import qualified Data.CaseInsensitive as CI - import qualified Database.Esqueleto as E @@ -316,13 +314,6 @@ postCRegisterR tid ssh csh = do redirect $ CourseR tid ssh csh CShowR -getCourseNewTemplateR :: Maybe TermId -> Maybe SchoolId -> Maybe CourseShorthand -> Handler Html -getCourseNewTemplateR mbTid mbSsh mbCsh = - redirect (CourseNewR, catMaybes [ ("tid",).termToText.unTermKey <$> mbTid - , ("ssh",).CI.original.unSchoolKey <$> mbSsh - , ("csh",).CI.original <$> mbCsh - ]) - getCourseNewR :: Handler Html -- call via toTextUrl getCourseNewR = do uid <- requireAuthId