From 907958baf440631b1847b64d2f477543b0f813b4 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Fri, 16 Mar 2018 13:06:52 +0100 Subject: [PATCH] Cleanup identified tables --- src/Handler/Utils/Table/Pagination.hs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Handler/Utils/Table/Pagination.hs b/src/Handler/Utils/Table/Pagination.hs index cbe39921b..428810362 100644 --- a/src/Handler/Utils/Table/Pagination.hs +++ b/src/Handler/Utils/Table/Pagination.hs @@ -4,6 +4,7 @@ , OverloadedStrings , TemplateHaskell , LambdaCase + , ViewPatterns #-} module Handler.Utils.Table.Pagination where @@ -70,7 +71,7 @@ instance Default PSValidator where tell . pure $ SomeMessage MsgPSLimitNonPositive dbTable :: PSValidator -> DBTable -> Handler Widget -dbTable PSValidator{..} DBTable{..} = do +dbTable PSValidator{..} DBTable{ dbtIdent = (toPathPiece -> dbtIdent), .. } = do let sortingOptions = mkOptionList [ Option t' (c, d) t' @@ -84,7 +85,9 @@ dbTable PSValidator{..} DBTable{..} = do Nothing -> return $ Left "Error parsing values" Just res -> return $ Right $ Just res (_, defPS) = runPSValidator Nothing - wIdent n = toPathPiece dbtIdent <> "-" <> n + wIdent n + | not $ null dbtIdent = dbtIdent <> "-" <> n + | otherwise = n psResult <- runInputGetResult $ PaginationSettings <$> ireq sortingField (wIdent "sorting")