Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
minerva
core
Commits
d7e9aad5
Commit
d7e9aad5
authored
Feb 24, 2020
by
Piotr Gawron
Browse files
Merge branch '1121-remove-overlay-twice' into 'devel_14.0.x'
don't allow to remove data overlay twice See merge request
!1065
parents
9170c859
e3b27d47
Pipeline
#21406
passed with stage
in 15 minutes and 27 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CHANGELOG
View file @
d7e9aad5
...
@@ -6,6 +6,8 @@ minerva (14.0.9) stable; urgency=medium
...
@@ -6,6 +6,8 @@ minerva (14.0.9) stable; urgency=medium
*
Bug
fix
:
transparent
complexes
are
shown
with
wrong
color
(#
1103
)
*
Bug
fix
:
transparent
complexes
are
shown
with
wrong
color
(#
1103
)
*
Bug
fix
:
CellDesigner
sometimes
marked
reduced
notation
reaction
as
*
Bug
fix
:
CellDesigner
sometimes
marked
reduced
notation
reaction
as
reversible
even
though
they
were
not
visualized
so
(#
1109
)
reversible
even
though
they
were
not
visualized
so
(#
1109
)
*
Bug
fix
:
when
data
overlay
was
being
removed
user
could
request
to
remove
overlay
second
time
and
an
error
was
thrown
(#
1121
)
--
Piotr
Gawron
<
piotr
.
gawron
@
uni
.
lu
>
Mon
,
3
Feb
2020
15
:
00
:
00
+
0200
--
Piotr
Gawron
<
piotr
.
gawron
@
uni
.
lu
>
Mon
,
3
Feb
2020
15
:
00
:
00
+
0200
...
...
frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js
View file @
d7e9aad5
...
@@ -422,9 +422,12 @@ OverlayPanel.prototype.openEditOverlayDialog = function (overlay) {
...
@@ -422,9 +422,12 @@ OverlayPanel.prototype.openEditOverlayDialog = function (overlay) {
message
:
"
Do you want to delete overlay:
"
+
overlay
.
getName
()
+
"
?
"
message
:
"
Do you want to delete overlay:
"
+
overlay
.
getName
()
+
"
?
"
}).
then
(
function
(
confirmation
)
{
}).
then
(
function
(
confirmation
)
{
if
(
confirmation
)
{
if
(
confirmation
)
{
GuiConnector
.
showProcessing
(
"
Removing
"
);
return
self
.
removeOverlay
(
overlay
).
then
(
function
()
{
return
self
.
removeOverlay
(
overlay
).
then
(
function
()
{
$
(
windowSelf
).
dialog
(
"
close
"
);
$
(
windowSelf
).
dialog
(
"
close
"
);
}).
catch
(
GuiConnector
.
alert
);
}).
catch
(
GuiConnector
.
alert
).
finally
(
function
()
{
GuiConnector
.
hideProcessing
();
});
}
}
});
});
}
}
...
...
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