Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
minerva
core
Commits
22d353ab
Commit
22d353ab
authored
Aug 14, 2019
by
Piotr Gawron
Browse files
name of the uploaded file is visible when addid overlay
parent
c6646fc5
Pipeline
#12774
passed with stage
in 16 minutes and 3 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CHANGELOG
View file @
22d353ab
...
...
@@ -4,6 +4,7 @@ minerva (13.1.3) stable; urgency=medium
* Bug fix: submap list must be selected to export from every submap (#874)
* Bug fix: export map as image properly uses bottom limit (#875)
* Bug fix: reaction info window wasn'
t
closed
on
CLEAR
(#
876
)
*
Bug
fix
:
name
of
the
uploaded
file
is
displayed
when
adding
overlay
(#
849
)
--
Piotr
Gawron
<
piotr
.
gawron
@
uni
.
lu
>
Wed
,
14
Aug
2019
17
:
00
:
00
+
0200
...
...
frontend-js/src/main/js/gui/AddOverlayDialog.js
View file @
22d353ab
...
...
@@ -94,9 +94,7 @@ AddOverlayDialog.prototype.createGui = function () {
name
:
"
overlay-file
"
});
fileInput
.
addEventListener
(
"
change
"
,
function
()
{
return
self
.
processFile
(
fileInput
.
files
[
0
]).
then
(
function
()
{
$
(
fileInput
).
val
(
""
);
}).
catch
(
GuiConnector
.
alert
);
return
self
.
processFile
(
fileInput
.
files
[
0
]).
catch
(
GuiConnector
.
alert
);
},
false
);
content
.
appendChild
(
fileInput
);
content
.
appendChild
(
guiUtils
.
createNewLine
());
...
...
@@ -293,9 +291,10 @@ AddOverlayDialog.prototype.open = function () {
return
self
.
addOverlay
().
then
(
function
(
result
)
{
$
(
dialog
).
dialog
(
"
close
"
);
return
result
;
}
,
function
(
error
)
{
}
).
catch
(
function
(
error
)
{
GuiConnector
.
hideProcessing
();
if
(
error
instanceof
NetworkError
&&
error
.
statusCode
===
HttpStatus
.
BAD_REQUEST
)
{
$
(
"
[name='overlay-file']
"
,
self
.
getElement
()).
val
(
""
);
var
errorMessage
=
JSON
.
parse
(
error
.
content
);
GuiConnector
.
alert
(
"
Problematic input: <br/>
"
+
errorMessage
.
reason
);
}
else
if
(
error
instanceof
SecurityError
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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