Skip to content

Internal: Fix course visibility in My Sessions page - refs BT#21604 #5738

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 20, 2024
Merged

Internal: Fix course visibility in My Sessions page - refs BT#21604 #5738

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ced5694
Internal: Fix course visibility in My Sessions page - refs BT#21604
christianbeeznest Aug 20, 2024
cfd13bc
Internal: Fix session display for coach based on duration and access …
christianbeeznest Aug 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions src/CoreBundle/Repository/SessionRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
use Chamilo\CoreBundle\Settings\SettingsManager;
use DateTime;
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\ORM\Query\Expr\Join;
use Doctrine\ORM\QueryBuilder;
use Doctrine\Persistence\ManagerRegistry;
Expand Down Expand Up @@ -130,8 +131,20 @@ public function getCurrentSessionsOfUserInUrl(User $user, AccessUrl $url): array
{
$sessions = $this->getSubscribedSessionsOfUserInUrl($user, $url);

$filterCurrentSessions = function (Session $session) use ($user) {
// Determine if the user is a coach
$filterCurrentSessions = function (Session $session) use ($user, $url) {

$userIsGeneralCoach = $session->hasUserAsGeneralCoach($user);
if (!$userIsGeneralCoach) {
$coursesAsCoach = $this->getSessionCoursesByStatusInCourseSubscription($user, $session, Session::COURSE_COACH, $url);
$coursesAsStudent = $this->getSessionCoursesByStatusInCourseSubscription($user, $session, Session::STUDENT, $url);
$validCourses = array_merge($coursesAsCoach, $coursesAsStudent);

if (empty($validCourses)) {
return false;
}
$session->setCourses(new ArrayCollection($validCourses));
}

$userIsCoach = $session->hasCoach($user);

// Check if session has a duration
Expand Down