From 72d1724a75d06ffd4cd2f16536a76da79828f86e Mon Sep 17 00:00:00 2001
From: Dominik Seeger <dominik.seeger@gmx.net>
Date: Mon, 8 Apr 2019 09:46:32 +0200
Subject: [PATCH] added no connection message and changed final checkbox
tooltip
---
.../toolbars/AnnotatedSubmissionBottomToolbar.vue | 2 +-
frontend/src/pages/Login.vue | 9 +++++++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/frontend/src/components/submission_notes/toolbars/AnnotatedSubmissionBottomToolbar.vue b/frontend/src/components/submission_notes/toolbars/AnnotatedSubmissionBottomToolbar.vue
index 2987961a..b9765e1f 100644
--- a/frontend/src/components/submission_notes/toolbars/AnnotatedSubmissionBottomToolbar.vue
+++ b/frontend/src/components/submission_notes/toolbars/AnnotatedSubmissionBottomToolbar.vue
@@ -49,7 +49,7 @@
v-model="isFinal"
class="final-checkbox" />
</v-toolbar-items>
- <span>Non final feedback will be sent to the reviewer.</span>
+ <span>If unchecked this submission will be marked for review by the lecturer</span>
</v-tooltip>
</v-flex>
<v-flex xs>
diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index c73fc809..1b3bdb47 100644
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -79,8 +79,13 @@ export default {
}).then(() => {
this.$router.push({ name: 'home' })
this.loading = false
- }).catch((er) => {
- Auth.SET_MESSAGE("Login failed. Please try again.")
+ }).catch((err) => {
+ let msg = "Login failed. Please try again."
+ if (typeof err === "string") {
+ msg = err
+ }
+
+ Auth.SET_MESSAGE(msg)
this.loading = false
})
},
--
GitLab