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 697d3e2f3da2db57e88cca6f5dc18798f2abc46a..218ad0706a6b71c2ec61726f48034e9db002d39f 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 @@ -113,7 +113,7 @@ public class JournalView { //TODO token URI location; try { - location = new URI("../pages/eportfolio.jsp"); + location = new URI("../pages/eportfolio.jsp?token=test"); log.debug("<<< saveJournal: redirect to " +location.toString()); return Response.temporaryRedirect(location).build(); diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/view/ProjectDescriptionView.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/view/ProjectDescriptionView.java index 8ae2757365b4cff015d6b86a8c7cfc04b5a215a1..ba29c2592521befb9c182edad18ec13d0b10b288 100644 --- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/view/ProjectDescriptionView.java +++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/view/ProjectDescriptionView.java @@ -49,7 +49,7 @@ public class ProjectDescriptionView { //TODO token try { - URI location = new URI("../pages/eportfolio.jsp?"); + URI location = new URI("../pages/eportfolio.jsp?token=test"); log.debug("<<< saveText: redirect to " +location.toString()); return Response.temporaryRedirect(location).build(); diff --git a/gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js b/gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js index 45fdee037dfd5c1d814acbd1a3c68ee8c2ebf959..1969dcd03c16d28d19b42958c122f8d8d0425689 100644 --- a/gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js +++ b/gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js @@ -64,7 +64,7 @@ function loadJournals(data) { data[journal].category + '</div>' + '<div class="journal-edit" align="right">' + - '<a class="btn btn-default btn-sm" href="createJournal.jsp?journal=' + data[journal].id + '"><i class="fa fa-pencil"></i> Bearbeiten</a>' + + '<a class="btn btn-default btn-sm" href="createJournal.jsp?token=test&journal=' + data[journal].id + '"><i class="fa fa-pencil"></i> Bearbeiten</a>' + '<a class="btn btn-default btn-sm" data-toggle="modal" data-target="#closeJournalModal"><i class="fa fa-check-square" aria-hidden="true"></i>Abschließen</a>' + '</div>' + '<div class="journal-text">' + diff --git a/gemeinsamforschen/src/main/webapp/pages/createJournal.jsp b/gemeinsamforschen/src/main/webapp/pages/createJournal.jsp index 827e258bc4c8537e5052cf5904c8578fda6c06d6..1edabf9631499d60bb0966743de7bdcbecc6a19a 100644 --- a/gemeinsamforschen/src/main/webapp/pages/createJournal.jsp +++ b/gemeinsamforschen/src/main/webapp/pages/createJournal.jsp @@ -82,7 +82,7 @@ <div class="journal-form-buttons"> <input class="btn btn-default btn-sm" type="submit"> - <a class="btn btn-default btn-sm" href="eportfolio.jsp"> Zurück </a> + <a class="btn btn-default btn-sm" href="eportfolio.jsp?token=test"> Zurück </a> </div> </div> diff --git a/gemeinsamforschen/src/main/webapp/pages/editDescription.jsp b/gemeinsamforschen/src/main/webapp/pages/editDescription.jsp index 9cabf2fb50a7cfe556c4e2bccabbd93691b4b9df..664220c7710c7890eb7d2ef947206ee27030e80a 100644 --- a/gemeinsamforschen/src/main/webapp/pages/editDescription.jsp +++ b/gemeinsamforschen/src/main/webapp/pages/editDescription.jsp @@ -56,7 +56,7 @@ <div class="description-form-buttons"> <input class="btn btn-default btn-sm" type="submit"> - <a class="btn btn-default btn-sm" href="eportfolio.jsp">Zurück</a> + <a class="btn btn-default btn-sm" href="eportfolio.jsp?token=test">Zurück</a> </div> </div> diff --git a/gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp b/gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp index 1e3fa86ccf93096c44492f48c7c22ec5cc6eae55..08e452126196eb62a4588ecf857858073fef91bc 100644 --- a/gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp +++ b/gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp @@ -51,7 +51,7 @@ <div class="journal-description-title"> </div> <div class="journal-description-edit" align="right"> - <a class="btn btn-default btn-sm" href="editDescription.jsp?project=0"> + <a class="btn btn-default btn-sm" href="editDescription.jsp?project=0&token=test"> <i class="fa fa-pencil"></i> Bearbeiten</a> <a class="btn btn-default btn-sm" data-toggle="modal" data-target="#closeDescriptionModal"><i class="fa fa-check-square" aria-hidden="true"></i>Abschließen</a> @@ -77,7 +77,7 @@ <option value="OWN">Eigene</option> </select> - <a class="btn btn-default btn-sm" href="createJournal.jsp">Neu</a> + <a class="btn btn-default btn-sm" href="createJournal.jsp?token=test">Neu</a> </div> <div class="journal"> </div>