Commit c8c36d46 authored by Alexandre Delanoë's avatar Alexandre Delanoë

Merge branch 'dev-tree-reload' of...

Merge branch 'dev-tree-reload' of ssh://gitlab.iscpif.fr:20022/gargantext/haskell-gargantext into dev-merge
parents b5738963 60f2083a
Pipeline #1336 failed with stage
......@@ -48,6 +48,7 @@ findNodes' r Private = do
findNodes' r Shared = findNodes r Shared $ [NodeFolderShared, NodeTeam] <> commonNodes
findNodes' r SharedDirect = findNodes r Shared $ [NodeFolderShared, NodeTeam] <> commonNodes
findNodes' r Public = findNodes r Public $ [NodeFolderPublic ] <> commonNodes
findNodes' r PublicDirect = findNodes r Public $ [NodeFolderPublic ] <> commonNodes
commonNodes:: [NodeType]
commonNodes = [NodeFolder, NodeCorpus, NodeList, NodeFolderShared, NodeTeam]
......@@ -133,7 +133,7 @@ tree_first_level r nodeTypes = do
-- , s ]
mainRoot <- findNodes r Private nodeTypes
-- printDebug (rPrefix "mainRoot") mainRoot
publicRoots <- findNodes r Public nodeTypes
publicRoots <- findNodes r PublicDirect nodeTypes
-- printDebug (rPrefix "publicRoots") publicRoots
sharedRoots <- findNodes r SharedDirect nodeTypes
-- printDebug (rPrefix "sharedRoots") sharedRoots
......@@ -142,7 +142,7 @@ tree_first_level r nodeTypes = do
pure ret
------------------------------------------------------------------------
data NodeMode = Private | Shared | Public | SharedDirect
data NodeMode = Private | Shared | Public | SharedDirect | PublicDirect
findNodes :: (HasTreeError err, HasNodeError err)
=> RootId
......@@ -153,6 +153,7 @@ findNodes r Private nt = dbTree r nt
findNodes r Shared nt = findShared r NodeFolderShared nt sharedTreeUpdate
findNodes r SharedDirect nt = findSharedDirect r NodeFolderShared nt sharedTreeUpdate
findNodes r Public nt = findShared r NodeFolderPublic nt publicTreeUpdate
findNodes r PublicDirect nt = findSharedDirect r NodeFolderPublic nt publicTreeUpdate
------------------------------------------------------------------------
-- | Collaborative Nodes in the Tree
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment