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
4da44009
Commit
4da44009
authored
Jan 28, 2019
by
Piotr Gawron
Browse files
Merge branch '653-change-warning-message-in-proper-branch' into 'devel_12.1.x'
changed warning text See merge request
!600
parents
f1fe0b2d
6c976c8f
Pipeline
#8511
passed with stage
in 1 minute and 55 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
frontend-js/src/main/js/map/window/AliasInfoWindow.js
View file @
4da44009
...
...
@@ -434,7 +434,7 @@ AliasInfoWindow.prototype.createGenomicDiv = function (params) {
}
if
(
geneticInformation
)
{
if
(
genomeUrls
.
length
===
0
)
{
contentElement
.
innerHTML
=
"
No
reference genome data available on minerva platform
"
;
contentElement
.
innerHTML
=
"
No
organism defined for this project, cannot display variant data
"
;
}
else
{
for
(
i
=
0
;
i
<
overlaysData
.
length
;
i
++
)
{
if
(
globalGeneVariants
[
i
].
length
>
0
)
{
...
...
frontend-js/src/test/js/map/window/AliasInfoWindow-test.js
View file @
4da44009
...
...
@@ -271,7 +271,7 @@ describe('AliasInfoWindow', function () {
return
win
.
createGenomicDiv
({
overlays
:
[
overlay
]});
}).
then
(
function
(
div
)
{
assert
.
ok
(
div
);
assert
.
ok
(
div
.
innerHTML
.
indexOf
(
"
No
reference genome data available on minerva platform
"
)
===
-
1
);
assert
.
ok
(
div
.
innerHTML
.
indexOf
(
"
No
organism defined for this project, cannot display variant data
"
)
===
-
1
);
win
.
destroy
();
});
...
...
@@ -301,7 +301,7 @@ describe('AliasInfoWindow', function () {
return
win
.
createGenomicDiv
({
overlays
:
overlays
});
}).
then
(
function
(
div
)
{
assert
.
ok
(
div
);
assert
.
ok
(
div
.
innerHTML
.
indexOf
(
"
No
reference genome data available on minerva platform
"
)
===
-
1
);
assert
.
ok
(
div
.
innerHTML
.
indexOf
(
"
No
organism defined for this project, cannot display variant data
"
)
===
-
1
);
win
.
destroy
();
});
...
...
@@ -340,7 +340,7 @@ describe('AliasInfoWindow', function () {
return
win
.
createGenomicDiv
({
overlays
:
[
overlay
]});
}).
then
(
function
(
div
)
{
assert
.
ok
(
div
);
assert
.
ok
(
div
.
innerHTML
.
indexOf
(
"
No
reference genome data available on minerva platform
"
)
>=
-
1
);
assert
.
ok
(
div
.
innerHTML
.
indexOf
(
"
No
organism defined for this project, cannot display variant data
"
)
>=
-
1
);
win
.
destroy
();
});
...
...
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