From 779cbf562befcd497cf3ba4ced5760ac9699f68a Mon Sep 17 00:00:00 2001 From: Daniel Date: Thu, 24 Aug 2023 13:41:59 +0200 Subject: [PATCH] fixed bug terms popup --- src/client/app/js/app/state/Home.js | 9 +++++---- src/server/server/control/TB_Server_Control_Profile.php | 1 - 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/client/app/js/app/state/Home.js b/src/client/app/js/app/state/Home.js index 9578a97..486aacd 100644 --- a/src/client/app/js/app/state/Home.js +++ b/src/client/app/js/app/state/Home.js @@ -246,15 +246,17 @@ app.state.Home = function() }, function( res ) { + console.log(res.profile); app.model.SessionUser.updateUserData( res.profile, res.profile_teams ); userGroups = app.model.SessionUser.getGroups(); for ( var ui = 0; ui < userGroups.length; ui++ ) { - let groupData = app.model.SessionUser.getUserProfile().getGroupData(userGroups[ ui ].id)[0]; - if (userGroups[ ui ].getTermsConditionsActive() && !groupData.terms_accepted) { - groupsTermsNotAccepted.push(userGroups[ ui ]); + let group = userGroups[ ui ]; + let groupData = app.model.SessionUser.getUserProfile().getGroupData(group.getId()); + if (group.getTermsConditionsActive() && groupData.terms_accepted !== 1) { + groupsTermsNotAccepted.push(group); } gcgIds = userGroups[ ui ].getCourseCategories(); @@ -264,7 +266,6 @@ app.state.Home = function() } } - if ( !filter || !filter.hasOwnProperty( 'version' ) ) { filter = { diff --git a/src/server/server/control/TB_Server_Control_Profile.php b/src/server/server/control/TB_Server_Control_Profile.php index 0bc4d65..b443c0a 100644 --- a/src/server/server/control/TB_Server_Control_Profile.php +++ b/src/server/server/control/TB_Server_Control_Profile.php @@ -645,7 +645,6 @@ class TB_Server_Control_Profile { $profile->setTermsConditionAccepted($groupId, $termsAccepted); $profile->save(); - return $resp; } } \ No newline at end of file