Skip to content
This repository was archived by the owner on Dec 14, 2023. It is now read-only.

Commit 7facc30

Browse files
committed
Merge pull request #167 from CoderDojo/ckiss-fixes
fixed issues caused by load_dojo_admins_for_user
2 parents d9df3c5 + 2ce46ca commit 7facc30

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

profiles.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,9 +495,12 @@ module.exports = function (options) {
495495
return champion.id === args.user ? args.user.id : null;
496496
});
497497

498-
seneca.act({role: 'cd-users', cmd: 'load_dojo_admins_for_user', userId: profile.userId, user: args.user}, function (err, dojoAdmins) {
498+
seneca.act({role: 'cd-users', cmd: 'load_dojo_admins_for_user', userId: profile.userId}, function (err, dojoAdmins) {
499499
if (err) return done(err);
500500
profile.requestingUserIsDojoAdmin = _.find(dojoAdmins, function (dojoAdmin) {
501+
if(!dojoAdmin.ok){
502+
return false
503+
}
501504
return dojoAdmin.id === args.user ? args.user.id : null;
502505
});
503506

users.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ module.exports = function (options) {
495495

496496
function cmd_load_dojo_admins_for_user (args, done) {
497497
var seneca = this;
498-
var userId = args.userId || args.user ? args.user.id : null;
498+
var userId = args.userId;
499499

500500
seneca.act({role: 'cd-dojos', cmd: 'dojos_for_user', id: userId}, function (err, dojos) {
501501
if (err) return done(err);

0 commit comments

Comments
 (0)