From 9293e52bbcef7f607fcc5deb607e17cc8487603a Mon Sep 17 00:00:00 2001
From: Thomas Schnaak <schnaak@uni-potsdam.de>
Date: Thu, 5 Jul 2018 11:03:12 +0200
Subject: [PATCH] fix: Journal tokens from url in js and html
---
.../src/main/webapp/assets/js/createJournal.js | 4 ++++
.../src/main/webapp/assets/js/e-portfolio.js | 11 ++++++++++-
.../src/main/webapp/assets/js/editDescription.js | 4 ++++
.../src/main/webapp/pages/createJournal.jsp | 3 ++-
.../src/main/webapp/pages/editDescription.jsp | 3 ++-
.../src/main/webapp/pages/eportfolio.jsp | 12 +++++++-----
6 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/createJournal.js b/gemeinsamforschen/src/main/webapp/assets/js/createJournal.js
index 96130eb0..7a5dba5a 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/createJournal.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/createJournal.js
@@ -10,6 +10,10 @@ function getQueryVariable(variable)
}
$(document).ready(function() {
+ $('#backLink').on('click', function(){
+ location.href="eportfolio.jsp?token="+getUserTokenFromUrl();
+ });
+
var journalID = getQueryVariable("journal");
console.log(journalID);
if(journalID){
diff --git a/gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js b/gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js
index 1969dcd0..658ed766 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/e-portfolio.js
@@ -1,6 +1,15 @@
//TODO Get student and project form context
$(document).ready(function() {
+ $('#editDescriptionLink').on('click', function(){
+ /*TODO getJournal*/
+ location.href="editDescription.jsp?project=0&token="+getUserTokenFromUrl();
+ });
+
+ $('#createJournalLink').on('click', function(){
+ location.href="createJournal.jsp?token="+getUserTokenFromUrl();
+ });
+
$.ajax({
url: "../rest/projectdescription/0"
}).then(function(data) {
@@ -64,7 +73,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?token='+getUserTokenFromUrl()+'&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/assets/js/editDescription.js b/gemeinsamforschen/src/main/webapp/assets/js/editDescription.js
index b6f6a893..77eeb044 100644
--- a/gemeinsamforschen/src/main/webapp/assets/js/editDescription.js
+++ b/gemeinsamforschen/src/main/webapp/assets/js/editDescription.js
@@ -1,4 +1,8 @@
$(document).ready(function() {
+ $('#backLink').on('click', function(){
+ location.href="eportfolio.jsp?token="+getUserTokenFromUrl();
+ });
+
$.ajax({
url: "../rest/projectdescription/0"
}).then(function(data) {
diff --git a/gemeinsamforschen/src/main/webapp/pages/createJournal.jsp b/gemeinsamforschen/src/main/webapp/pages/createJournal.jsp
index 1edabf96..ac3da978 100644
--- a/gemeinsamforschen/src/main/webapp/pages/createJournal.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/createJournal.jsp
@@ -13,6 +13,7 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
+ <script src="../assets/js/utility.js"></script>
<link rel="stylesheet" href="../assets/fonts/font-awesome.min.css">
<link rel="stylesheet" href="../assets/css/Community-ChatComments.css">
<link rel="stylesheet" href="../assets/css/Sidebar-Menu-1.css">
@@ -82,7 +83,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?token=test"> Zurück </a>
+ <a id="backLink" class="btn btn-default btn-sm"> Zurück </a>
</div>
</div>
diff --git a/gemeinsamforschen/src/main/webapp/pages/editDescription.jsp b/gemeinsamforschen/src/main/webapp/pages/editDescription.jsp
index 664220c7..1113922a 100644
--- a/gemeinsamforschen/src/main/webapp/pages/editDescription.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/editDescription.jsp
@@ -13,6 +13,7 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/inscrybmde@1.11.3/dist/inscrybmde.min.js"></script>
+ <script src="../assets/js/utility.js"></script>
<link rel="stylesheet" href="../assets/fonts/font-awesome.min.css">
<link rel="stylesheet" href="../assets/css/Community-ChatComments.css">
<link rel="stylesheet" href="../assets/css/Sidebar-Menu-1.css">
@@ -56,7 +57,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 id="backLink" class="btn btn-default btn-sm">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..9b8c7327 100644
--- a/gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp
+++ b/gemeinsamforschen/src/main/webapp/pages/eportfolio.jsp
@@ -9,13 +9,15 @@
<title>E-Portfolio</title>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
<link rel="stylesheet" href="../assets/css/styles.css">
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
- <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
<link rel="stylesheet" href="../assets/fonts/font-awesome.min.css">
<link rel="stylesheet" href="../assets/css/Community-ChatComments.css">
<link rel="stylesheet" href="../assets/css/Sidebar-Menu-1.css">
<link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
<link rel="stylesheet" href="../assets/css/e-portfolio.css">
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+ <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+ <script src="../assets/js/utility.js"></script>
+
</head>
<body>
@@ -51,7 +53,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 id="editDescriptionLink" class="btn btn-default btn-sm">
<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>
@@ -70,14 +72,14 @@
</div>
<div id="journal-container" class="tab-pane fade">
- <h2>Lernatagebuch</h2>
+ <h2>Lerntagebuch</h2>
<div class="input-group">
<select id="journalfilter" class="form-control" style="width:auto;" onchange="filterJournals()">
<option value="ALL">Alle</option>
<option value="OWN">Eigene</option>
</select>
- <a class="btn btn-default btn-sm" href="createJournal.jsp?token=test">Neu</a>
+ <a id="createJournalLink"class="btn btn-default btn-sm" >Neu</a>
</div>
<div class="journal">
</div>
--
GitLab