fraport/fradrive-old
Archived
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(workflows): disabled warning for top workflows/instances

Browse Source
This commit is contained in:
Gregor Kleen 2021-07-26 15:55:53 +02:00
parent 2ad3dab487
commit 17ed2fad22
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Handler/Workflow/Instance/List.hs
View File

@ -187,7 +187,7 @@ workflowInstanceListR rScope = workflowsDisabledWarning title heading $ do
getTopWorkflowInstanceListR :: Handler Html getTopWorkflowInstanceListR :: Handler Html
getTopWorkflowInstanceListR = do getTopWorkflowInstanceListR = workflowsDisabledWarning title heading $ do
gInstances <- runDB $ do gInstances <- runDB $ do
wis <- selectList [] [] wis <- selectList [] []
wis' <- fmap catMaybes . forM wis $ \wi@(Entity wiId WorkflowInstance{..}) -> runMaybeT $ do wis' <- fmap catMaybes . forM wis $ \wi@(Entity wiId WorkflowInstance{..}) -> runMaybeT $ do
@ -216,8 +216,8 @@ getTopWorkflowInstanceListR = do
) )
return $ sortOn iSortProj <$> Map.fromListWith (<>) wis' return $ sortOn iSortProj <$> Map.fromListWith (<>) wis'
siteLayoutMsg MsgTopWorkflowInstancesHeading $ do siteLayoutMsg heading $ do
setTitleI MsgTopWorkflowInstancesTitle setTitleI title
let instanceList rScope instances = $(widgetFile "workflows/instances") let instanceList rScope instances = $(widgetFile "workflows/instances")
where where
toInitiateRoute = toInitiateRoute' rScope toInitiateRoute = toInitiateRoute' rScope
@ -243,3 +243,5 @@ getTopWorkflowInstanceListR = do
toEditRoute' rScope win = _WorkflowScopeRoute # (rScope, WorkflowInstanceR win WIEditR) toEditRoute' rScope win = _WorkflowScopeRoute # (rScope, WorkflowInstanceR win WIEditR)
toListRoute' rScope win = _WorkflowScopeRoute # (rScope, WorkflowInstanceR win WIWorkflowsR) toListRoute' rScope win = _WorkflowScopeRoute # (rScope, WorkflowInstanceR win WIWorkflowsR)
toUpdateRoute' rScope win = _WorkflowScopeRoute # (rScope, WorkflowInstanceR win WIUpdateR) toUpdateRoute' rScope win = _WorkflowScopeRoute # (rScope, WorkflowInstanceR win WIUpdateR)
(title, heading) = (MsgTopWorkflowInstancesTitle, MsgTopWorkflowInstancesHeading)

2
src/Handler/Workflow/Workflow/List.hs
View File

@ -114,7 +114,7 @@ getAdminWorkflowWorkflowListR = workflowWorkflowList headings def $ const E.true
where headings = (MsgAdminWorkflowWorkflowListTitle, MsgAdminWorkflowWorkflowListHeading) where headings = (MsgAdminWorkflowWorkflowListTitle, MsgAdminWorkflowWorkflowListHeading)
getTopWorkflowWorkflowListR :: Handler Html 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) where headings = (MsgWorkflowWorkflowListTopTitle, MsgWorkflowWorkflowListTopHeading)