Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
haskell-gargantext
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
195
Issues
195
List
Board
Labels
Milestones
Merge Requests
12
Merge Requests
12
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gargantext
haskell-gargantext
Commits
60f2083a
Commit
60f2083a
authored
Jan 11, 2021
by
Przemyslaw Kaminski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[tree] fix for public nodes being shown (PublicDirect type)
parent
d88ee4c1
Pipeline
#1335
failed with stage
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
Find.hs
src/Gargantext/Core/Text/List/Social/Find.hs
+1
-0
Tree.hs
src/Gargantext/Database/Query/Tree.hs
+3
-2
No files found.
src/Gargantext/Core/Text/List/Social/Find.hs
View file @
60f2083a
...
...
@@ -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
]
src/Gargantext/Database/Query/Tree.hs
View file @
60f2083a
...
...
@@ -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
Public
Direct
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment