Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Gitlab will go into maintenance Friday 3rd February from 9:00 to 10:00
Open sidebar
minerva
core
Commits
32647bee
Commit
32647bee
authored
Jun 09, 2021
by
Piotr Gawron
Browse files
update of data overlay in admin panel did not work
parent
11d16cc0
Changes
4
Hide whitespace changes
Inline
Side-by-side
CHANGELOG
View file @
32647bee
minerva
(
16.0.0
~
beta
.1
)
stable
;
urgency
=
medium
*
Bug
fix
:
there
was
issue
with
updating
data
overlay
in
admin
panel
"Unknown
parameter: defaultOverlay"
--
Piotr
Gawron
<
piotr
.
gawron
@
uni
.
lu
>
Wed
,
9
Jun
2021
15
:
00
:
00
+
0200
minerva
(
16.0.0
~
beta
.0
)
stable
;
urgency
=
medium
*
Backward
incompatibility
:
debian
package
cannot
be
upgraded
from
version
prior
to
12.1.0
(#
1464
)
...
...
frontend-js/package-lock.json
View file @
32647bee
...
...
@@ -26,6 +26,7 @@
"jstree"
:
"^3.3.8"
,
"jszip"
:
"^3.2.2"
,
"log4js"
:
"^4.5.1"
,
"md5"
:
"^2.2.1"
,
"molart"
:
"1.7.0"
,
"multi-checkbox-list"
:
"^0.3.1"
,
"openlayers"
:
"^4.6.5"
,
...
...
@@ -996,6 +997,14 @@
"node"
:
">=0.8.0"
}
},
"node_modules/charenc"
:
{
"version"
:
"0.0.2"
,
"resolved"
:
"https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz"
,
"integrity"
:
"sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc="
,
"engines"
:
{
"node"
:
"*"
}
},
"node_modules/check-error"
:
{
"version"
:
"1.0.2"
,
"resolved"
:
"https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz"
,
...
...
@@ -1373,6 +1382,14 @@
"sha.js"
:
"^2.4.8"
}
},
"node_modules/crypt"
:
{
"version"
:
"0.0.2"
,
"resolved"
:
"https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz"
,
"integrity"
:
"sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs="
,
"engines"
:
{
"node"
:
"*"
}
},
"node_modules/crypto-browserify"
:
{
"version"
:
"3.12.0"
,
"resolved"
:
"https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz"
,
...
...
@@ -3015,9 +3032,9 @@
}
},
"node_modules/is-buffer"
:
{
"version"
:
"1.1.
5
"
,
"resolved"
:
"https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.
5
.tgz"
,
"integrity"
:
"sha
1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw
="
"version"
:
"1.1.
6
"
,
"resolved"
:
"https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.
6
.tgz"
,
"integrity"
:
"sha
512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=
="
},
"node_modules/is-dotfile"
:
{
"version"
:
"1.0.3"
,
...
...
@@ -3937,6 +3954,16 @@
"node"
:
">=0.10.0"
}
},
"node_modules/md5"
:
{
"version"
:
"2.3.0"
,
"resolved"
:
"https://registry.npmjs.org/md5/-/md5-2.3.0.tgz"
,
"integrity"
:
"sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g=="
,
"dependencies"
:
{
"charenc"
:
"0.0.2"
,
"crypt"
:
"0.0.2"
,
"is-buffer"
:
"~1.1.6"
}
},
"node_modules/md5.js"
:
{
"version"
:
"1.3.5"
,
"resolved"
:
"https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz"
,
...
...
@@ -7309,6 +7336,11 @@
"strip-ansi"
:
"~0.1.0"
}
},
"charenc"
:
{
"version"
:
"0.0.2"
,
"resolved"
:
"https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz"
,
"integrity"
:
"sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc="
},
"check-error"
:
{
"version"
:
"1.0.2"
,
"resolved"
:
"https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz"
,
...
...
@@ -7635,6 +7667,11 @@
"sha.js"
:
"^2.4.8"
}
},
"crypt"
:
{
"version"
:
"0.0.2"
,
"resolved"
:
"https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz"
,
"integrity"
:
"sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs="
},
"crypto-browserify"
:
{
"version"
:
"3.12.0"
,
"resolved"
:
"https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz"
,
...
...
@@ -9035,9 +9072,9 @@
}
},
"is-buffer"
:
{
"version"
:
"1.1.
5
"
,
"resolved"
:
"https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.
5
.tgz"
,
"integrity"
:
"sha
1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw
="
"version"
:
"1.1.
6
"
,
"resolved"
:
"https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.
6
.tgz"
,
"integrity"
:
"sha
512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=
="
},
"is-dotfile"
:
{
"version"
:
"1.0.3"
,
...
...
@@ -9809,6 +9846,16 @@
"resolved"
:
"https://registry.npmjs.org/marked/-/marked-0.3.19.tgz"
,
"integrity"
:
"sha512-ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg=="
},
"md5"
:
{
"version"
:
"2.3.0"
,
"resolved"
:
"https://registry.npmjs.org/md5/-/md5-2.3.0.tgz"
,
"integrity"
:
"sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g=="
,
"requires"
:
{
"charenc"
:
"0.0.2"
,
"crypt"
:
"0.0.2"
,
"is-buffer"
:
"~1.1.6"
}
},
"md5.js"
:
{
"version"
:
"1.3.5"
,
"resolved"
:
"https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz"
,
...
...
frontend-js/src/main/js/gui/admin/EditProjectDialog.js
View file @
32647bee
...
...
@@ -1008,14 +1008,18 @@ EditProjectDialog.prototype.overlayToTableRow = function (overlay, users) {
if
(
overlay
.
isDefaultOverlay
())
{
checked
=
"
checked
"
;
}
var
defaultOverlayCheckbox
=
"
<input type='checkbox' data='
"
+
id
+
"
' name='defaultOverlay'
"
+
checked
+
disabled
+
"
/>
"
;
var
defaultOverlayCheckbox
;
var
downloadSourceButton
;
if
(
overlay
.
getInputDataAvailable
())
{
defaultOverlayCheckbox
=
""
;
overlay
.
setDefaultOverlay
(
undefined
);
downloadSourceButton
=
"
<button name='downloadSource' data='
"
+
id
+
"
'
"
+
disabled
+
"
>
"
+
"
<span class='ui-icon ui-icon-arrowthickstop-1-s'></span>
"
+
"
</button>
"
;
}
else
{
downloadSourceButton
=
"
N/A
"
;
defaultOverlayCheckbox
=
"
<input type='checkbox' data='
"
+
id
+
"
' name='defaultOverlay'
"
+
checked
+
disabled
+
"
/>
"
;
}
row
[
0
]
=
id
;
...
...
rest-api/src/main/java/lcsb/mapviewer/api/projects/overlays/OverlayRestImpl.java
View file @
32647bee
...
...
@@ -210,10 +210,7 @@ public class OverlayRestImpl extends BaseRestImpl {
layout
.
setGoogleLicenseConsent
((
Boolean
)
overlayData
.
get
(
"googleLicenseConsent"
));
}
else
if
(
key
.
equalsIgnoreCase
(
"creator"
))
{
if
(
""
.
equals
(
value
))
{
if
(
layout
.
getCreator
()
!=
null
)
{
reorderUsers
.
add
(
layout
.
getCreator
());
}
layout
.
setCreator
(
null
);
throw
new
QueryException
(
"overlay creator must be defined"
);
}
else
{
if
(
layout
.
getCreator
()
==
null
)
{
reorderUsers
.
add
(
getUserService
().
getUserByLogin
((
String
)
value
));
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment