From 87c166820a8b7dc8970f2644820e37345f342981 Mon Sep 17 00:00:00 2001
From: Martin Staehr <software@mstaehr.net>
Date: Sun, 9 Jun 2019 15:25:42 +0200
Subject: [PATCH] #77 fix annotation and seefeedback
---
.../src/main/webapp/annotation/js/giveFeedbackRest.js | 6 ++++--
gemeinsamforschen/src/main/webapp/project/js/tasks.js | 6 +++++-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/gemeinsamforschen/src/main/webapp/annotation/js/giveFeedbackRest.js b/gemeinsamforschen/src/main/webapp/annotation/js/giveFeedbackRest.js
index 7e0814da..21f17592 100644
--- a/gemeinsamforschen/src/main/webapp/annotation/js/giveFeedbackRest.js
+++ b/gemeinsamforschen/src/main/webapp/annotation/js/giveFeedbackRest.js
@@ -87,8 +87,10 @@ function getContributionFeedback(fullSubmissionId, fullSubmissionPartCategory, g
type: "GET",
dataType: "json",
success: function (response) {
- response.text = JSON.parse(response.text);
- responseHandler(response);
+ if (response) {
+ response.text = JSON.parse(response.text);
+ responseHandler(response);
+ }
}
});
}
diff --git a/gemeinsamforschen/src/main/webapp/project/js/tasks.js b/gemeinsamforschen/src/main/webapp/project/js/tasks.js
index 40a53c64..5c66ad2d 100644
--- a/gemeinsamforschen/src/main/webapp/project/js/tasks.js
+++ b/gemeinsamforschen/src/main/webapp/project/js/tasks.js
@@ -217,7 +217,11 @@ function fitObjectInTmpl(object) {
break;
case "ANNOTATE_DOSSIER":
result.solveTaskWith = "Annotiere das Dossier";
- result.solveTaskWithLink = "redirect(\'../annotation/create-unstructured-annotation.jsp?projectName=" + object.projectName + "&submissionId=" + object.taskData.fullSubmissionId + "\')";
+ result.solveTaskWithLink = "redirect(\'../annotation/create-unstructured-annotation.jsp?" + $.param({
+ projectName: object.projectName,
+ submissionId: object.taskData.fullSubmissionId,
+ contributionCategory: "Dossier"
+ }) + "\')";
break;
case "FINALIZE_DOSSIER":
result.solveTaskWith = "Finalisiere das Dossier";
--
GitLab