Skip to content

Glossary: Fix import and save of glossary terms - refs #6722 #6878

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
Oct 8, 2025
Merged

Glossary: Fix import and save of glossary terms - refs #6722 #6878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e348a1
Glossary: Fix import and save of glossary terms - refs #6722
Ilyassbennanii Oct 8, 2025
3ae8cb4
Minor: Code style changes
ywarnier Oct 8, 2025
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
9 changes: 5 additions & 4 deletions src/CoreBundle/Controller/Api/ImportCGlossaryAction.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ public function __invoke(Request $request, CGlossaryRepository $repo, EntityMana
foreach ($data as $termToUpdate => $descriptionToUpdate) {
// Check if the term already exists
$qb = $repo->getResourcesByCourse($course, $session)
->andWhere('resource.name = :name')
->setParameter('name', $termToUpdate)
->andWhere('resource.title = :title')
->setParameter('title', $termToUpdate)
;

/** @var CGlossary $existingGlossaryTerm */
Expand All @@ -120,10 +120,11 @@ public function __invoke(Request $request, CGlossaryRepository $repo, EntityMana

foreach ($data as $term => $description) {
$qb = $repo->getResourcesByCourse($course, $session)
->andWhere('resource.name = :name')
->setParameter('name', $term)
->andWhere('resource.title = :title')
->setParameter('title', $term)
;


/** @var CGlossary $existingNewGlossaryTerm */
$existingNewGlossaryTerm = $qb->getQuery()->getOneOrNullResult();
if (!$existingNewGlossaryTerm) {
Expand Down
2 changes: 1 addition & 1 deletion src/CoreBundle/Controller/Api/UpdateCGlossaryAction.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public function __invoke(CGlossary $glossary, Request $request, CGlossaryReposit
$description = $data['description'];
$parentResourceNodeId = $data['parentResourceNodeId'];
$resourceLinkList = json_decode($data['resourceLinkList'], true);
$sid = isset($data['sid']) ? (int) $data['sid'] : null;
$sid = isset($data['sid']) ? (int) $data['sid'] : 0;
$cid = (int) $data['cid'];

$course = null;
Expand Down
Loading