Merge pull request #25 from MatsMoll/fix/minor-improvments

[fix] Minor improvments
MatsMoll · Feb 13, 2020 · f4583b5 · f4583b5
2 parents b55ae82 + c1a3ce7
commit f4583b5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/Public/assets/js/flash-card/edit.js b/Public/assets/js/flash-card/edit.js
@@ -28,7 +28,7 @@ function editFlashCard() {
             }
         })
         .then(function (json) {
-            window.location.href = "/tasks/flash-card/" + json.id;
+            window.location.href = "/creator/tasks/flash-card/" + json.id + "/edit?wasUpdated=true";
         })
         .catch(function (error) {
             presentErrorMessage(error.message);

diff --git a/Sources/App/Subject Test/SubjectTestWebController.swift b/Sources/App/Subject Test/SubjectTestWebController.swift
@@ -175,12 +175,18 @@ class SubjectTestWebController<API: SubjectTestAPIControlling>: SubjectTestWebCo
             .map { _ in
                 req.redirect(to: "results")
         }
+        .catchMap { error in
+            switch error {
+            case SubjectTest.DatabaseRepository.Errors.alreadyEnded: return req.redirect(to: "results")
+            default: throw error
+            }
+        }
     }
 
     static func results(on req: Request) throws -> EventLoopFuture<HTTPResponse> {
 
         let user = try req.requireAuthenticated(User.self)
-
+        
         return try API.results(on: req)
             .map { results in