From bf0ce5616594a3c0ef7836283229e4cf5bd39017 Mon Sep 17 00:00:00 2001 From: Thomas Schnaak <schnaak@uni-potsdam.de> Date: Wed, 4 Jul 2018 10:26:54 +0200 Subject: [PATCH] fix: added tokens to links for clickdummy --- .../java/unipotsdam/gf/modules/journal/view/JournalView.java | 2 +- .../gf/modules/journal/view/ProjectDescriptionView.java | 2 +- gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js | 2 +- gemeinsamforschen/src/main/webapp/pages/createJournal.jsp | 2 +- gemeinsamforschen/src/main/webapp/pages/editDescription.jsp | 2 +- gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp | 4 ++-- 6 files changed, 7 insertions(+), 7 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 697d3e2f..218ad070 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 8ae27573..ba29c259 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 45fdee03..1969dcd0 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 827e258b..1edabf96 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 9cabf2fb..664220c7 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 1e3fa86c..08e45212 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> -- GitLab