Commit 897c1b6f authored by malzer's avatar malzer
Browse files

Fix issue #71

parent 688cc2ec
......@@ -460,9 +460,7 @@ function login(action) {
if (action) {
questionmark = '?' + action;
}
window.location = pdpURL + window.location.href + questionmark;
//window.location = pdpURL + window.location.protocol + "//" + window.location.hostname + window.location.pathname + questionmark;
}
/**
......
......@@ -12,6 +12,9 @@ var numberOfHEADCallsCompleted; // Used to determine if pagniations can be enabl
*/
function loadOwnStorageFileList() {
// Assemble bearer token and logID.
if (!readToken() && window.location.hash) {
setTokenDSE();
}
var token = bearerPrefix + readToken();
var logID = logIDPrefix + (new Date()).getMilliseconds();
$.ajax({
......@@ -49,7 +52,6 @@ function loadOwnStorageFileList() {
*/
function createPaginationAndListElements(currentPage) {
// TODO Check again for auth here?
// Do some computations and saveguards.
var pages = Math.floor(ownStorageElementList.length / ownStorageElementListSize) + 1;
if (currentPage > pages) {
......
......@@ -93,7 +93,7 @@ function init() {
else if (action === 'create') {
createNew();
}
// Datasheet shall be uhared.
// Datasheet shall be shared.
else if (action === 'share') {
shareGeobrowserDataset();
}
......
......@@ -76,6 +76,7 @@ function getDateColumns() {
var indices = [];
var dateColumnNames = ['TimeStamp', 'TimeSpan:begin', 'TimeSpan:end'];
dateColumnNames.forEach(function(name){
if (data.length < 1) return;
var dateColumn = data[0].findIndex(x => x === name);
if (dateColumn !== -1) indices.push(dateColumn);
});
......
......@@ -19,13 +19,13 @@
<script src="https://code.jquery.com/jquery.min.js"></script>
<script src="../js/dariah.geobro.conf.js"></script>
<script src="../js/sessionStorageWrapper.js"></script>
<script src="./js/dariah.utils.js"></script>
<script src="./js/dariah.storage.js"></script>
<script src="./js/dariah.storage.list.js"></script>
<script src="./js/dariah.utils.js"></script>
<script src="./js/dariah.workflow.conf.js"></script>
<script>getEmbeddedDariahStatus();</script>
<script>loadOwnStorageFileList();</script>
<style>
<style>
body { padding-top: 50px; }
</style>
<script src="../js/matomo.js"></script>
......@@ -149,10 +149,6 @@
</noscript>
<!-- javascript
================================================== -->
<!-- placed at the end of the document so the pages load faster -->
<script src="https://res.de.dariah.eu/dhrep/js/bootstrap.js"></script>
<!-- functions for checking dates -->
<script src="./js/dariah.workflow.datecheck.js"></script>
<script src="https://res.de.dariah.eu/globalmenu/globalmenu.js"></script>
<script src="https://res.de.dariah.eu/dhrep/js/clipboard-2.0.0.min.js"></script>
</body>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment