Merge branch '5048' into 1.11.x

ywarnier · ywarnier · commit a151a2bf0161 · 2024-10-13T01:20:38.000+02:00
diff --git a/main/inc/ajax/course_category.ajax.php b/main/inc/ajax/course_category.ajax.php
@@ -31,7 +31,8 @@
             $result = '';
             foreach ($courses as $course) {
                 $row++;
-                $table->setCellContents($row, 0, $course['title']);
+                $courseLink = '<a href="'.api_get_path(WEB_PATH).'courses/'.$course['directory'].'/index.php">'.$course['title'].'</a>';
+                $table->setCellContents($row, 0, $courseLink);
             }
 
             echo $table->toHtml();
diff --git a/main/inc/lib/course_category.lib.php b/main/inc/lib/course_category.lib.php
@@ -728,7 +728,7 @@ public static function getCoursesInCategory(
 
         $urlCondition = ' access_url_id = '.api_get_current_access_url_id().' AND';
         $tbl_url_rel_course = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
-        $select = " DISTINCT course.id, course.code, course.title, course.category_code ";
+        $select = " DISTINCT course.id, course.code, course.title, course.category_code, course.directory ";
         if ($getCount) {
             $select = "count(DISTINCT course.id) as count";
         }

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,8 @@`
`31`	`31`	`$result = '';`
`32`	`32`	`foreach ($courses as $course) {`
`33`	`33`	`$row++;`
`34`		`- $table->setCellContents($row, 0, $course['title']);`
	`34`	`+ $courseLink = '<a href="'.api_get_path(WEB_PATH).'courses/'.$course['directory'].'/index.php">'.$course['title'].'</a>';`
	`35`	`+ $table->setCellContents($row, 0, $courseLink);`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`echo $table->toHtml();`
Original file line number	Diff line number	Diff line change
`@@ -728,7 +728,7 @@ public static function getCoursesInCategory(`
`728`	`728`
`729`	`729`	`$urlCondition = ' access_url_id = '.api_get_current_access_url_id().' AND';`
`730`	`730`	`$tbl_url_rel_course = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);`
`731`		`- $select = " DISTINCT course.id, course.code, course.title, course.category_code ";`
	`731`	`+ $select = " DISTINCT course.id, course.code, course.title, course.category_code, course.directory ";`
`732`	`732`	`if ($getCount) {`
`733`	`733`	`$select = "count(DISTINCT course.id) as count";`
`734`	`734`	`}`