From 7d8d8439ccd91c96e3280e670a5a4df180562ed3 Mon Sep 17 00:00:00 2001
From: Thomas Schnaak <schnaak@uni-potsdam.de>
Date: Wed, 4 Jul 2018 10:01:04 +0200
Subject: [PATCH] fix: set link in menue, removed token from links(temporary)
---
.../java/unipotsdam/gf/core/management/user/Menu.java | 2 +-
.../unipotsdam/gf/modules/journal/view/JournalView.java | 4 ++--
.../gf/modules/journal/view/ProjectDescriptionView.java | 8 ++++----
.../src/main/webapp/assets/js/e-portfolio.js | 2 +-
.../src/main/webapp/pages/editDescription.jsp | 2 +-
gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp | 4 ++--
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java
index 06874129..3c280e6c 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java
@@ -24,7 +24,7 @@ public class Menu extends SimpleTagSupport {
" <ul class=\"sidebar-nav\">\n" +
" <li class=\"sidebar-brand\"><a href=\"overview-student.html\">overview</a></li>\n" +
" <li><a href=\"takeQuiz.jsp\">Quizfrage</a></li>\n" +
- " <li><a href=\"#\">ePortfolio</a></li>\n" +
+ " <li><a href=\"eportfolio.jsp\">ePortfolio</a></li>\n" +
" <li><a href=\"#\">Beitrag</a></li>\n" +
" <li><a href=\"finalAssessments.jsp\">Bewertung</a></li>\n" +
" <li><a href=\"../index.jsp\">Logout</a></li>\n" +
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 8a26fbc4..697d3e2f 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?token=test");
+ location = new URI("../pages/eportfolio.jsp");
log.debug("<<< saveJournal: redirect to " +location.toString());
return Response.temporaryRedirect(location).build();
@@ -158,7 +158,7 @@ public class JournalView {
journalService.closeJournal(journal);
//TODO token
try {
- URI location = new URI("../pages/eportfolio.jsp?token=test");
+ URI location = new URI("../pages/eportfolio.jsp?");
log.debug("<<< closeJournal: 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 5e8afa67..8ae27573 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?token=test");
+ URI location = new URI("../pages/eportfolio.jsp?");
log.debug("<<< saveText: redirect to " +location.toString());
return Response.temporaryRedirect(location).build();
@@ -74,7 +74,7 @@ public class ProjectDescriptionView {
try {
- URI location = new URI("../pages/eportfolio.jsp?token=test");
+ URI location = new URI("../pages/eportfolio.jsp");
log.debug("<<< addLink: redirect to " +location.toString());
return Response.temporaryRedirect(location).build();
@@ -99,7 +99,7 @@ public class ProjectDescriptionView {
descriptionService.deleteLink(link);
//TODO token
try {
- URI location = new URI("../pages/eportfolio.jsp?token=test");
+ URI location = new URI("../pages/eportfolio.jsp");
log.debug("<<< deleteLink: redirect to " +location.toString());
return Response.temporaryRedirect(location).build();
@@ -122,7 +122,7 @@ public class ProjectDescriptionView {
descriptionService.closeDescription(desc);
//TODO token
try {
- URI location = new URI("../pages/eportfolio.jsp?token=test");
+ URI location = new URI("../pages/eportfolio.jsp");
log.debug("<<< closeDescription: 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 1969dcd0..45fdee03 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?token=test&journal=' + data[journal].id + '"><i class="fa fa-pencil"></i> Bearbeiten</a>' +
+ '<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" 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/editDescription.jsp b/gemeinsamforschen/src/main/webapp/pages/editDescription.jsp
index 664220c7..9cabf2fb 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?token=test">Zurück</a>
+ <a class="btn btn-default btn-sm" href="eportfolio.jsp">Zurück</a>
</div>
</div>
diff --git a/gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp b/gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp
index 08e45212..1e3fa86c 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&token=test">
+ <a class="btn btn-default btn-sm" href="editDescription.jsp?project=0">
<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?token=test">Neu</a>
+ <a class="btn btn-default btn-sm" href="createJournal.jsp">Neu</a>
</div>
<div class="journal">
</div>
--
GitLab