Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Wolfgang Knopki
Spacedeck-open-SAML
Commits
2f39dd26
Commit
2f39dd26
authored
Apr 09, 2020
by
mntmn
Browse files
fix listing of invited-to-spaces in user's home folder
parent
3edde7c5
Changes
1
Hide whitespace changes
Inline
Side-by-side
routes/api/spaces.js
View file @
2f39dd26
...
...
@@ -52,7 +52,8 @@ router.get('/', function(req, res, next) {
db
.
Membership
.
findAll
({
where
:{
user_id
:
req
.
user
.
_id
}}).
then
(
memberships
=>
{
// search for spaces
var
validMemberships
=
memberships
.
filter
(
function
(
m
)
{
if
(
!
m
.
space_id
||
(
m
.
space_id
==
"
undefined
"
))
return
false
;
...
...
@@ -80,7 +81,8 @@ router.get('/', function(req, res, next) {
});
}
else
if
(
req
.
query
.
parent_space_id
&&
req
.
query
.
parent_space_id
!=
req
.
user
.
home_folder_id
)
{
// list spaces in a folder
db
.
Space
.
findOne
({
where
:
{
_id
:
req
.
query
.
parent_space_id
...
...
@@ -113,14 +115,17 @@ router.get('/', function(req, res, next) {
});
}
else
{
// list home folder and spaces/folders that the user is a member of
db
.
Membership
.
findAll
({
where
:
{
user_id
:
req
.
user
.
_id
}}).
then
(
memberships
=>
{
if
(
!
memberships
)
memberships
=
[];
var
validMemberships
=
memberships
.
filter
(
function
(
m
)
{
if
(
!
m
.
space_id
||
(
m
.
space_id
==
"
undefined
"
))
return
false
;
return
true
;
});
var
spaceIds
=
validMemberships
.
map
(
function
(
m
)
{
...
...
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