From 49c457e62a23861808d96b85dda4fcb54523f93f Mon Sep 17 00:00:00 2001
From: "robinwilliam.hundt" <robinwilliam.hundt@stud.uni-goettingen.de>
Date: Mon, 4 Feb 2019 12:39:09 +0100
Subject: [PATCH] Quick fix for validation problem
---
frontend/src/store/modules/submission-notes.ts | 2 +-
grady/settings/default.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/frontend/src/store/modules/submission-notes.ts b/frontend/src/store/modules/submission-notes.ts
index b34a6d71..87f35f37 100644
--- a/frontend/src/store/modules/submission-notes.ts
+++ b/frontend/src/store/modules/submission-notes.ts
@@ -147,7 +147,7 @@ async function submitFeedback ({ state }: BareActionContext<SubmissionNotesState
if (Object.keys(state.updatedFeedback.feedbackLines || {}).length > 0) {
feedback.feedbackLines = state.updatedFeedback.feedbackLines
- } else if (feedback.score! < SubmissionNotes.submissionType.fullScore!) {
+ } else if (feedback.score! < SubmissionNotes.submissionType.fullScore! && !state.hasOrigFeedback) {
throw new Error('You need to add or change a comment when setting a non full score.')
}
// delete those comments that have been marked for deletion
diff --git a/grady/settings/default.py b/grady/settings/default.py
index c5ca4ee3..a147a3d8 100644
--- a/grady/settings/default.py
+++ b/grady/settings/default.py
@@ -159,7 +159,7 @@ JSON_CAMEL_CASE = {
}
JWT_AUTH = {
- 'JWT_EXPIRATION_DELTA': datetime.timedelta(seconds=3600),
+ 'JWT_EXPIRATION_DELTA': datetime.timedelta(seconds=18000),
'JWT_ALLOW_REFRESH': True,
}
--
GitLab