From 9f835d7b82eebe45cc8cb40c4a76bca7d61e34a0 Mon Sep 17 00:00:00 2001
From: tudtianus <tudtianus@gmail.com>
Date: Sat, 30 Jun 2018 18:58:47 +0200
Subject: [PATCH] fix: redirection in createJournal

---
 .../gf/modules/journal/view/JournalView.java       | 14 ++++++++++++++
 .../src/main/webapp/pages/createJournal.jsp        |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/view/JournalView.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/view/JournalView.java
index 84f99318..60f8ebf4 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/view/JournalView.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/view/JournalView.java
@@ -10,6 +10,8 @@ import unipotsdam.gf.modules.journal.service.JournalService;
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 
 /**
@@ -108,6 +110,18 @@ public class JournalView {
 
         journalService.saveJournal(id, student, project, text, visibility, category);
 
+        //TODO token
+        URI location = null;
+        try {
+            location = new URI("../pages/eportfolio.jsp?token=test");
+            log.debug("<<< saveJournal: redirect to "  +location.toString());
+            return Response.temporaryRedirect(location).build();
+
+        } catch (URISyntaxException e) {
+            e.printStackTrace();
+            log.debug("saveJournal: redirect failed" );
+        }
+
         log.debug("<<< saveJournal");
 
         return Response.ok().build();
diff --git a/gemeinsamforschen/src/main/webapp/pages/createJournal.jsp b/gemeinsamforschen/src/main/webapp/pages/createJournal.jsp
index f1deb4e9..3abf960d 100644
--- a/gemeinsamforschen/src/main/webapp/pages/createJournal.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/createJournal.jsp
@@ -42,7 +42,7 @@
 					<td  id="yourContent">
 						<h1> Tagebucheintrag erstellen </h1>
 
-						<form id="journalform" class="form-journal" method="POST" action="../rest/journal/save">
+						<form id="journalform" class="form-journal" method="POST" action="../rest/journal/save" >
 
 							<input type="hidden" name="student" value="0">
 							<input type="hidden" name="project" value="0">
@@ -75,7 +75,7 @@
 
 								<div class="journal-form-buttons">
 									<input type="submit">
-									<button> Zur&uuml;ck </button>
+									<a href="eportfolio.jsp"><button> Zur&uuml;ck </button></a>
 								</div>
 
 							</div>
-- 
GitLab