Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ICAT
Datahub
Commits
d8c2e4ed
Commit
d8c2e4ed
authored
Jun 29, 2021
by
Marjolaine Bodin
Browse files
Merge branch 'issue_514' into 'master'
It fixes
#514
Closes
#514
See merge request
!533
parents
a23f44cd
485f11dc
Pipeline
#49507
passed with stages
in 5 minutes and 6 seconds
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
src/components/Logbook/EventFooter.js
View file @
d8c2e4ed
...
...
@@ -13,7 +13,11 @@ import {
*/
class
EventFooter
extends
React
.
Component
{
render
()
{
const
{
cancelButtonLabel
,
isSaveButtonVisible
}
=
this
.
props
;
const
{
cancelButtonLabel
,
isSaveButtonVisible
,
loading
=
false
,
}
=
this
.
props
;
return
(
<
div
style
=
{{
position
:
'
relative
'
,
height
:
37
}}
>
...
...
@@ -37,6 +41,7 @@ class EventFooter extends React.Component {
<
Button
className
=
"
btn btn-primary
"
bsSize
=
"
small
"
disabled
=
{
loading
}
onClick
=
{()
=>
this
.
props
.
onSaveButtonClicked
()}
>
{
'
'
}
...
...
src/components/Logbook/NewOrEditEventPanel.js
View file @
d8c2e4ed
...
...
@@ -262,6 +262,7 @@ function NewOrEditEventPanel(props) {
isSaveButtonEnabled
=
{
true
}
onCancelButtonClicked
=
{()
=>
onCancelButtonClicked
()}
onSaveButtonClicked
=
{()
=>
onSaveButtonClicked
()}
loading
=
{
loading
}
/
>
<
/div
>
<
/div
>
...
...
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