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
EOLE
Zéphir
WebUI
Commits
5a3baa29
Commit
5a3baa29
authored
May 21, 2019
by
Lionel Morin
Browse files
Merge branch '396_disable_deletion' into 'develop'
fix 396_disable_deletion See merge request
!3
parents
eb4da2c3
c013d430
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/pages/ServerSelectionsPage/ServerSelectionUsersList.js
View file @
5a3baa29
...
...
@@ -82,12 +82,12 @@ import { serverselectionActions } from '../../actions';
primary
=
{
user
}
secondary
=
{
role
}
/
>
{
this
.
state
.
isOverIcon
&&
{
this
.
state
.
isOverIcon
&&
role
!==
'
owner
'
&&
<
Tooltip
title
=
"
Editer
"
>
<
EditUser
className
=
{
classes
.
iconuser
}
onClick
=
{
this
.
handleEditUserDialogOpenClick
}
/
>
<
/Tooltip
>
}
{
this
.
state
.
isOverIcon
&&
{
this
.
state
.
isOverIcon
&&
role
!==
'
owner
'
&&
<
Tooltip
title
=
"
Supprimer
"
>
<
DeleteUser
className
=
{
classes
.
iconuser
}
onClick
=
{
this
.
handleDeleteUserDialogOpenClick
}
/
>
<
/Tooltip
>
...
...
src/pages/ServerSelectionsPage/ServerSelectionsDetail.js
View file @
5a3baa29
...
...
@@ -112,7 +112,7 @@ class ServerSelectionsDetail extends React.Component {
inner
=
{
inner
}
backLink
=
{
`/serverselections`
}
navRight
=
{
serverselection
&&
serverselection
&&
!
serverselection
.
serverselectionname
.
includes
(
"
_DEFAULT
"
)
&&
<
div
>
<
ResponsiveButton
sm
=
{
sm
}
...
...
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