From 17ed2fad2230944c629c6a0c8d8181f6fec8983f Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Mon, 26 Jul 2021 15:55:53 +0200 Subject: [PATCH] fix(workflows): disabled warning for top workflows/instances --- src/Handler/Workflow/Instance/List.hs | 8 +++++--- src/Handler/Workflow/Workflow/List.hs | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Handler/Workflow/Instance/List.hs b/src/Handler/Workflow/Instance/List.hs index 66c73f030..e2515faf5 100644 --- a/src/Handler/Workflow/Instance/List.hs +++ b/src/Handler/Workflow/Instance/List.hs @@ -187,7 +187,7 @@ workflowInstanceListR rScope = workflowsDisabledWarning title heading $ do getTopWorkflowInstanceListR :: Handler Html -getTopWorkflowInstanceListR = do +getTopWorkflowInstanceListR = workflowsDisabledWarning title heading $ do gInstances <- runDB $ do wis <- selectList [] [] wis' <- fmap catMaybes . forM wis $ \wi@(Entity wiId WorkflowInstance{..}) -> runMaybeT $ do @@ -216,8 +216,8 @@ getTopWorkflowInstanceListR = do ) return $ sortOn iSortProj <$> Map.fromListWith (<>) wis' - siteLayoutMsg MsgTopWorkflowInstancesHeading $ do - setTitleI MsgTopWorkflowInstancesTitle + siteLayoutMsg heading $ do + setTitleI title let instanceList rScope instances = $(widgetFile "workflows/instances") where toInitiateRoute = toInitiateRoute' rScope @@ -243,3 +243,5 @@ getTopWorkflowInstanceListR = do toEditRoute' rScope win = _WorkflowScopeRoute # (rScope, WorkflowInstanceR win WIEditR) toListRoute' rScope win = _WorkflowScopeRoute # (rScope, WorkflowInstanceR win WIWorkflowsR) toUpdateRoute' rScope win = _WorkflowScopeRoute # (rScope, WorkflowInstanceR win WIUpdateR) + + (title, heading) = (MsgTopWorkflowInstancesTitle, MsgTopWorkflowInstancesHeading) diff --git a/src/Handler/Workflow/Workflow/List.hs b/src/Handler/Workflow/Workflow/List.hs index 10c394f8e..b68469a7d 100644 --- a/src/Handler/Workflow/Workflow/List.hs +++ b/src/Handler/Workflow/Workflow/List.hs @@ -114,7 +114,7 @@ getAdminWorkflowWorkflowListR = workflowWorkflowList headings def $ const E.true where headings = (MsgAdminWorkflowWorkflowListTitle, MsgAdminWorkflowWorkflowListHeading) getTopWorkflowWorkflowListR :: Handler Html -getTopWorkflowWorkflowListR = workflowWorkflowList headings def . views queryWorkflowWorkflow $ isTopWorkflowScopeSql . (E.^. WorkflowWorkflowScope) +getTopWorkflowWorkflowListR = workflowsDisabledWarnings (headings ^. _1) (headings ^. _2) workflowWorkflowList headings def . views queryWorkflowWorkflow $ isTopWorkflowScopeSql . (E.^. WorkflowWorkflowScope) where headings = (MsgWorkflowWorkflowListTopTitle, MsgWorkflowWorkflowListTopHeading)