From 4ec616f6c91cde1d451255ee401bca688ace998f Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Wed, 30 Jun 2021 19:25:08 -0500 Subject: [PATCH] Skill: Fix URL for "skill issued all" --- public/main/inc/lib/SkillRelUserModel.php | 15 +++++++++++---- src/CoreBundle/Controller/BadgeController.php | 9 +++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/public/main/inc/lib/SkillRelUserModel.php b/public/main/inc/lib/SkillRelUserModel.php index b7f5ae399d..aa02c7c5f0 100644 --- a/public/main/inc/lib/SkillRelUserModel.php +++ b/public/main/inc/lib/SkillRelUserModel.php @@ -3,6 +3,7 @@ /* For licensing terms, see /license.txt */ use Chamilo\CoreBundle\Entity\SkillRelUser; +use Chamilo\CoreBundle\Framework\Container; class SkillRelUserModel extends Model { @@ -123,12 +124,18 @@ class SkillRelUserModel extends Model /** * Get the URL for the All issues page. - * - * @return string */ - public static function getIssueUrlAll(SkillRelUser $skillIssue) + public static function getIssueUrlAll(SkillRelUser $skillIssue): string { - return api_get_path(WEB_PATH)."skill/{$skillIssue->getSkill()->getId()}/user/{$skillIssue->getUser()->getId()}"; + $router = Container::$container->get('router'); + + return $router->generate( + 'badge_issued_all', + [ + 'skill_id' => $skillIssue->getSkill()->getId(), + 'user_id' => $skillIssue->getUser()->getId(), + ] + ); } /** diff --git a/src/CoreBundle/Controller/BadgeController.php b/src/CoreBundle/Controller/BadgeController.php index fcefad40ec..5ee8925843 100644 --- a/src/CoreBundle/Controller/BadgeController.php +++ b/src/CoreBundle/Controller/BadgeController.php @@ -19,4 +19,13 @@ class BadgeController extends AbstractController '/main/badge/issued.php?'.http_build_query(['issue' => $id]) ); } + + #[Route('/badge/{skill_id}/user{user_id}')] + #[Route('/skill/{skill_id}/user{user_id}', name: 'badge_issued_all')] + public function issuedAll(int $skillId, int $userId): Response + { + return $this->redirect( + '/main/badge/issued_all.php?'.http_build_query(['skill' => $skillId, 'user' => $userId]) + ); + } }