Commit d0ea0e44 authored by malzer's avatar malzer
Browse files

Fix bug #89 and update changelog

parents 3fd1942b 7d8a2fd6
Bugfix Version 4.0.7
====================
* "/index.html" no longer necessary to recognize DatasheetEditor per URL
* Fixes bug #89
Bugfix Version 4.0.6
====================
......
......@@ -4,7 +4,7 @@
### Release PLATIN first (only if changed)
For a new Geo-Browser release, make sure that the [DARIAH-DE PLATIN Library](https://github.com/DARIAH-DE/PLATIN) is up-to-date. I.e., for an actual release,
merge the updated `develop` branch into the `master` branch (only if changed at all!). For a BETA release, PLATIN's `develop` branch will be checked out by the Pipeline, so if you have any separate new feature branches on PLATIN, merge them into `develop`. In PLATIN, the URL to the storage will be determined automatically depending on the URL of the application.
merge the updated `develop` branch into the `main` branch (only if changed at all!). For a BETA release, PLATIN's `develop` branch will be checked out by the Pipeline, so if you have any separate new feature branches on PLATIN, merge them into `develop`. In PLATIN, the URL to the storage will be determined automatically depending on the URL of the application.
### Release Geo-Browser
......@@ -25,4 +25,4 @@ merge the updated `develop` branch into the `master` branch (only if changed at
The tag will trigger the `develop` (BETA) pipeline on Gitlab CI and deploy this version on the BETA server.
Once this has been finished successfully, you can RELEASE the same version on the live server. All URL updates / version names will be handled automatically. You just need to trigger the `master` (RELEASE) pipeline by merging `develop` into `master`.
Once this has been finished successfully, you can RELEASE the same version on the live server. All URL updates / version names will be handled automatically. You just need to trigger the `main` (RELEASE) pipeline by merging `develop` into `main`.
......@@ -40,7 +40,7 @@ import ClipboardJS from "clipboard";
*/
$(document).ready(function() {
getEmbeddedDariahStatus(); //Check status of DARIAH services
var isDataSheetEditor = document.location.href.includes("/edit/index.html");
var isDataSheetEditor = document.location.href.includes("/edit/");
var isList = document.location.href.includes("/edit/list.html");
if (!isDataSheetEditor && !isList) return;
if (isList) loadOwnStorageFileList();
......@@ -70,6 +70,7 @@ function toggleLogin(){
*/
function init() {
// Drag and drop handler for CSV documents to workarea.
console.log("INIT");
$('#workArea')
.on('dragover', handleDragOver, false)
.on('drop', handleDropFileSelect);
......@@ -94,6 +95,7 @@ function init() {
let searchParams = new URLSearchParams(window.location.search)
var action = searchParams.get('action') || '';
setDSID(searchParams.get('id') || '');
var dsid = getDSID();
// Set id to login button if existing. So datasheet is reloaded after login.
if (!readToken()) {
......
{
"name": "dariahde-datasheet-editor",
"version": "4.0.6",
"version": "4.0.7",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "dariahde-datasheet-editor",
"version": "4.0.6",
"version": "4.0.7",
"dependencies": {
"clipboard": "^2.0.8",
"handsontable": "^9.0.2",
......
{
"name": "dariahde-datasheet-editor",
"version": "4.0.6",
"version": "4.0.7",
"private": true,
"scripts": {
"build:beta": "webpack --config webpack.config.dev.js",
......
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