Commit eb0eca6c authored by Stefan Funk's avatar Stefan Funk 🐧
Browse files

Merge branch 'release/3.6.6'

parents 251a1ee0 20ad1243
Bugfix Version 3.6.6 (February 25th 2021)
=========================================
* Fix #34678 (If coords undefined, write “undefined“ in KML, not “NaN“)
* Fix #34680 (Error message shall not appear if only one place is given in table)
Bugfix Version 3.6.5 (February 24th 2021)
=========================================
......
......@@ -18,7 +18,7 @@ node {
// TODO: Set version number in the HTML pages, too! Decide between releases and snapshots!
// SNAPSHOTs are put into the SNAPSHOTS repo, releases and BETAs are put into the RELEASES repo!
package_version = '3.6.5'
package_version = '3.6.6'
name = 'dariahde-geobrowser'
description = 'DARIAH-DE Geo-Browser'
url = 'https://geobrowser.de.dariah.eu/'
......@@ -34,7 +34,7 @@ node {
git clone https://github.com/DARIAH-DE/PLATIN.git
# FIXME: Remove develop checkout if releasing!!!
#cd PLATIN && git checkout develop && rake all
# cd PLATIN && git checkout develop && rake all
cd PLATIN && rake all
cd ../edit && bower install
......
......@@ -63,8 +63,8 @@ version = '2021'
# The full version, including alpha/beta/rc tags.
# Please put here the release date as release version!
release = '2021-02-24'
#release = '2021-02-24-BETA'
release = '2021-02-25'
#release = '2021-02-25-BETA'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
......
......@@ -225,12 +225,13 @@
<i class="icon-globe"></i>
&nbsp;View dataset
</button>
<div id="validationIssue"></div>
</div>
</div>
</div> <!-- id="content-layout" -->
<div class="row-fluid">
<div class="span12 no-margin footer">
<span>Datasheet Editor version 3.6.5 &copy;2021 DARIAH-DE &nbsp; <a href="https://validator.w3.org/nu/?doc=https://geobrowser.de.dariah.eu/edit/index.html">&nbsp;</a></span>
<span>Datasheet Editor version 3.6.6 &copy;2021 DARIAH-DE &nbsp; <a href="https://validator.w3.org/nu/?doc=https://geobrowser.de.dariah.eu/edit/index.html">&nbsp;</a></span>
<ul class="pull-right inline">
<li><a href="https://de.dariah.eu/impressum">Imprint</a></li>
<li><a href="https://de.dariah.eu/privacy-policy">Privacy Policy</a></li>
......
......@@ -417,21 +417,20 @@ function checkCoordinates() {
var addressCol = findColumn(arr, 'Address');
var result = true;
$(arr).each(function(rowIndex, rowData){
// Do not check header and empty address columns.
var addressData = rowData[addressCol];
if (rowIndex !== 0) {
$(arr).each(function(rowIndex, rowData) {
// Do not check header and empty rows.
if (rowIndex !== 0 && !rowIsEmpty(rowData)) {
var rvla = isValidLat(rowIndex, rowData, latCol);
if (!isEmptyString(addressData) && !rvla) {
if (!rvla) {
latErrorInRow.push(errLink(rowIndex, latCol));
result = rvla;
}
var rvlo = isValidLong(rowIndex, rowData, longCol);
if (!isEmptyString(addressData) && !rvlo) {
if (!rvlo) {
longErrorInRow.push(errLink(rowIndex, longCol));
result = rvlo;
}
result = rvla && rvlo;
}
}
});
if (!result) {
......
......@@ -404,15 +404,19 @@ function openGeoBrowser(newWindow, coordValidation) {
// Check all at once.
var val1 = checkColumnHeadersGeobrowser();
var val2 = checkDates();
var val3 = checkCoordinates();
// Overwrite geocoordinates validation result.
// Overwrite geocoordinates validation result if coordValidation is set to true.
if (!coordValidation) {
val3 = true;
}
else {
var val3 = checkCoordinates();
}
// TODO Maybe jump to error message div directly here?
if (! (val1 && val2 && val3) ) {
return;
}
// Check for beta in URL.
// Check-for-beta-in-URL-workaround.
// TODO Handle in config or use current URL path!
var beta = "";
if (window.location.pathname.includes("beta")) {
beta = "/beta";
......
......@@ -204,3 +204,16 @@ function updateCoordinates(address, lat, long, gettyId, forceOverwrite, variant)
autoSave();
}
}
/**
* This function checks if a row is empty.
*/
function rowIsEmpty(rowData) {
var result = true;
rowData.forEach((item) => {
if (item) {
result = false;
}
}) ;
return result;
}
......@@ -119,7 +119,7 @@
</div> <!-- id="content-layout" -->
<div class="row-fluid">
<div class="span12 no-margin footer">
<span>Datasheet Editor version 3.6.5 &copy;2021 DARIAH-DE &nbsp; <a href="https://validator.w3.org/nu/?doc=https://geobrowser.de.dariah.eu/edit/list.html">&nbsp;</a></span>
<span>Datasheet Editor version 3.6.6 &copy;2021 DARIAH-DE &nbsp; <a href="https://validator.w3.org/nu/?doc=https://geobrowser.de.dariah.eu/edit/list.html">&nbsp;</a></span>
<ul class="pull-right inline">
<li><a href="https://de.dariah.eu/impressum">Imprint</a></li>
<li><a href="https://de.dariah.eu/privacy-policy">Privacy Policy</a></li>
......
......@@ -143,7 +143,7 @@
</div>
<div class="row-fluid">
<div class="span12 no-margin footer">
<span>Geo-Browser version 3.6.5 using <a href="https://github.com/DARIAH-DE/PLATIN">PLATIN</a> &copy;2021 DARIAH-DE &nbsp; <a href="https://validator.w3.org/nu/?doc=https://geobrowser.de.dariah.eu/index.html">&nbsp;</a></span>
<span>Geo-Browser version 3.6.6 using <a href="https://github.com/DARIAH-DE/PLATIN">PLATIN</a> &copy;2021 DARIAH-DE &nbsp; <a href="https://validator.w3.org/nu/?doc=https://geobrowser.de.dariah.eu/index.html">&nbsp;</a></span>
<ul class="pull-right inline">
<li><a href="https://de.dariah.eu/impressum">Imprint</a></li>
<li><a href="https://de.dariah.eu/privacy-policy">Privacy Policy</a></li>
......
......@@ -3,7 +3,7 @@
*/
// The DARIAH-DE OwnStorage endpoint.
// FIXME Please change for beta!
// FIXME Please change for release!
//var storageURL = 'https://cdstar.de.dariah.eu/test/dariah/';
var storageURL = 'https://cdstar.de.dariah.eu/dariah/';
......@@ -11,7 +11,7 @@ var storageURL = 'https://cdstar.de.dariah.eu/dariah/';
var oldStorageURL = 'https://geobrowser.de.dariah.eu/storage/';
// The DARIAH-DE PDP URL.
// FIXME Please change for beta!
// FIXME Please change for release!
//var pdpURL = 'https://pdpdev.de.dariah.eu/oauth2/oauth2/authorize?response_type=token&client_id=dariah-de-geo-browser&scope=read,write&redirect_uri=';
var pdpURL = 'https://pdp.de.dariah.eu/oauth2/oauth2/authorize?response_type=token&client_id=dariah-de-geo-browser&scope=read,write&redirect_uri=';
......
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