From d37003f6934920e2362d590a46dafbba7bc758c3 Mon Sep 17 00:00:00 2001 From: jduehring Date: Thu, 28 Nov 2024 14:44:13 +0100 Subject: [PATCH 1/5] fix wrong dcTitle key --- frontend/js/integrations/search.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/js/integrations/search.js b/frontend/js/integrations/search.js index 8074ec2c2..a8e9a1715 100644 --- a/frontend/js/integrations/search.js +++ b/frontend/js/integrations/search.js @@ -115,7 +115,7 @@ define([ return { video_extid: id, series_extid: mediaPackage.series, - title: result.dcTitle + title: result.dc.title }; }); }, From 3e3ba7c9a1e0fb7e80ecc7a399a55638acd0c6a4 Mon Sep 17 00:00:00 2001 From: jduehring Date: Mon, 9 Dec 2024 10:54:56 +0100 Subject: [PATCH 2/5] simplify function --- frontend/js/integrations/search.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/js/integrations/search.js b/frontend/js/integrations/search.js index a8e9a1715..d620aa971 100644 --- a/frontend/js/integrations/search.js +++ b/frontend/js/integrations/search.js @@ -111,11 +111,11 @@ define([ * @return {Promise.} Metadata about the video */ getVideoParameters: function () { - return $.when(mediaPackageId, searchResult, mediaPackage).then(function (id, result, mediaPackage) { + return mediaPackage.then(function (mediaPackage) { return { - video_extid: id, + video_extid: mediaPackage.id, series_extid: mediaPackage.series, - title: result.dc.title + title: mediaPackage.title, }; }); }, From 5d059f80e287d492076626441f90b980e5845819 Mon Sep 17 00:00:00 2001 From: jduehring Date: Mon, 9 Dec 2024 12:36:51 +0100 Subject: [PATCH 3/5] extended edit-template --- frontend/templates/list-annotation-edit.tmpl | 27 ++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/frontend/templates/list-annotation-edit.tmpl b/frontend/templates/list-annotation-edit.tmpl index fe0bfbba3..7d66fe1e3 100644 --- a/frontend/templates/list-annotation-edit.tmpl +++ b/frontend/templates/list-annotation-edit.tmpl @@ -84,4 +84,31 @@ +
+
+ {{t "annotation.author"}} + {{created_by_nickname}} + {{t "annotation.created"}} + {{formatDate created_at}} + {{t "annotation.track"}} + {{track}} +
+ +
+ {{#each content}} + {{> (lookup . 'type') annotation=..}} + {{/each}} +
+ + {{#if isMine}} + {{#unless createdFromQuestionnaire}} +
+ +
+ {{/unless}} + {{/if}} +
+
From 1d03314315908572266a06952825a52d951dce21 Mon Sep 17 00:00:00 2001 From: jduehring Date: Mon, 9 Dec 2024 12:39:10 +0100 Subject: [PATCH 4/5] remove changes from previous PR --- frontend/js/integrations/search.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/js/integrations/search.js b/frontend/js/integrations/search.js index d620aa971..a8e9a1715 100644 --- a/frontend/js/integrations/search.js +++ b/frontend/js/integrations/search.js @@ -111,11 +111,11 @@ define([ * @return {Promise.} Metadata about the video */ getVideoParameters: function () { - return mediaPackage.then(function (mediaPackage) { + return $.when(mediaPackageId, searchResult, mediaPackage).then(function (id, result, mediaPackage) { return { - video_extid: mediaPackage.id, + video_extid: id, series_extid: mediaPackage.series, - title: mediaPackage.title, + title: result.dc.title }; }); }, From 70c53210c25875ceb48aa302f14906f9fcd82c03 Mon Sep 17 00:00:00 2001 From: jduehring Date: Mon, 9 Dec 2024 12:39:50 +0100 Subject: [PATCH 5/5] remove changes from previous PR --- frontend/js/integrations/search.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/js/integrations/search.js b/frontend/js/integrations/search.js index a8e9a1715..8074ec2c2 100644 --- a/frontend/js/integrations/search.js +++ b/frontend/js/integrations/search.js @@ -115,7 +115,7 @@ define([ return { video_extid: id, series_extid: mediaPackage.series, - title: result.dc.title + title: result.dcTitle }; }); },