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
1601acaa
Commit
1601acaa
authored
Mar 30, 2020
by
Piotr Gawron
Browse files
author list handles missing values properly
parent
15d235c9
Pipeline
#23832
passed with stage
in 14 minutes and 31 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CHANGELOG
View file @
1601acaa
...
@@ -9,6 +9,8 @@ minerva (14.0.11) stable; urgency=medium
...
@@ -9,6 +9,8 @@ minerva (14.0.11) stable; urgency=medium
minerva
(#
1202
)
minerva
(#
1202
)
*
Bug
fix
:
infinity
value
in
kinetic
parameter
could
not
be
parsed
from
*
Bug
fix
:
infinity
value
in
kinetic
parameter
could
not
be
parsed
from
CellDesigner
file
minerva
(#
1203
)
CellDesigner
file
minerva
(#
1203
)
*
Bug
fix
:
author
list
inproperly
presented
author
data
when
some
fields
were
missing
(#
1201
)
--
Piotr
Gawron
<
piotr
.
gawron
@
uni
.
lu
>
Mon
,
30
Mar
2020
10
:
00
:
00
+
0200
--
Piotr
Gawron
<
piotr
.
gawron
@
uni
.
lu
>
Mon
,
30
Mar
2020
10
:
00
:
00
+
0200
...
...
frontend-js/src/main/js/gui/leftPanel/GuiUtils.js
View file @
1601acaa
...
@@ -453,17 +453,26 @@ GuiUtils.prototype.createAuthorsList = function (authors) {
...
@@ -453,17 +453,26 @@ GuiUtils.prototype.createAuthorsList = function (authors) {
className
:
"
minerva-annotation-body
"
className
:
"
minerva-annotation-body
"
});
});
var
desc
=
author
.
firstName
+
"
"
+
author
.
lastName
;
var
desc
=
""
;
if
(
author
.
firstName
!==
null
&&
author
.
firstName
!==
undefined
)
{
desc
=
author
.
firstName
+
"
"
;
}
if
(
author
.
lastName
!==
null
&&
author
.
lastName
!==
undefined
)
{
desc
+=
author
.
lastName
;
}
if
(
desc
===
""
)
{
desc
=
author
.
email
;
}
var
link
;
var
link
;
if
(
author
.
email
!==
undefined
)
{
if
(
author
.
email
!==
undefined
&&
author
.
email
!==
null
)
{
link
=
Functions
.
createElement
({
type
:
"
a
"
,
href
:
"
mailto:
"
+
author
.
email
,
content
:
desc
});
link
=
Functions
.
createElement
({
type
:
"
a
"
,
href
:
"
mailto:
"
+
author
.
email
,
content
:
desc
});
}
else
{
}
else
{
link
=
Functions
.
createElement
({
type
:
"
span
"
,
content
:
desc
});
link
=
Functions
.
createElement
({
type
:
"
span
"
,
content
:
desc
});
}
}
body
.
appendChild
(
link
);
body
.
appendChild
(
link
);
if
(
author
.
organisation
!==
undefined
)
{
if
(
author
.
organisation
!==
undefined
&&
author
.
organisation
!==
null
)
{
body
.
appendChild
(
Functions
.
createElement
({
type
:
"
span
"
,
content
:
"
,
"
+
author
.
organisation
}));
body
.
appendChild
(
Functions
.
createElement
({
type
:
"
span
"
,
content
:
"
,
"
+
author
.
organisation
}));
}
}
...
...
frontend-js/src/main/js/map/data/MapModel.js
View file @
1601acaa
...
@@ -13,10 +13,10 @@ var Reaction = require('./Reaction');
...
@@ -13,10 +13,10 @@ var Reaction = require('./Reaction');
/**
/**
* @typedef {Object} Author
* @typedef {Object} Author
* @property {string} firstName
* @property {
?null|
string} firstName
* @property {string} lastName
* @property {
?null|
string} lastName
* @property {string} [organisation]
* @property {
?null|
string} [organisation]
* @property {string} [email]
* @property {
?null|
string} [email]
*/
*/
/**
/**
...
...
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