Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Rex Dri
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
32
Issues
32
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Rex Dri
Rex Dri
Commits
43debf33
Commit
43debf33
authored
Mar 09, 2019
by
Florent Chehab
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't show a badge if nbversion <= 1
fixed bug related to opening the moderation panel.
parent
942857c3
Pipeline
#36165
passed with stages
in 4 minutes and 47 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
frontend/src/components/common/MyBadge.js
frontend/src/components/common/MyBadge.js
+1
-1
frontend/src/components/university/modules/common/moduleWrapperFunctions/renderFirstRow.js
...y/modules/common/moduleWrapperFunctions/renderFirstRow.js
+1
-1
No files found.
frontend/src/components/common/MyBadge.js
View file @
43debf33
...
...
@@ -10,7 +10,7 @@ import Badge from "@material-ui/core/Badge";
* @returns
*/
export
default
function
MyBadge
(
props
)
{
if
(
props
.
badgeContent
)
{
if
(
props
.
badgeContent
>
1
)
{
return
(
<
Badge
badgeContent
=
{
props
.
badgeContent
}
color
=
{
props
.
color
}
max
=
{
5
}
>
{
props
.
children
}
...
...
frontend/src/components/university/modules/common/moduleWrapperFunctions/renderFirstRow.js
View file @
43debf33
...
...
@@ -42,7 +42,7 @@ export default function renderFirstRow(userCanModerate) {
<
Tooltip
title
=
{
moderTooltip
}
placement
=
"
top
"
>
<
div
style
=
{{
display
:
"
inline-block
"
}}
>
{
/* Needed to fire events for the tooltip when below is disabled! when below is disabled!! */
}
<
MyBadge
className
=
{
classes
.
badge
}
badgeContent
=
{
nbPendingModeration
}
color
=
"
secondary
"
>
<
IconButton
aria
-
label
=
"
Modération
"
disabled
=
{
moderClass
==
"
disabled
"
||
moderClass
==
"
green
"
}
onClick
=
{()
=>
this
.
handleOpenPendingModeration
()}
className
=
{
classes
.
button
}
>
<
IconButton
aria
-
label
=
"
Modération
"
disabled
=
{
moderClass
==
"
disabled
"
||
moderClass
==
"
green
"
}
onClick
=
{()
=>
this
.
openPendingModerationPanel
()}
className
=
{
classes
.
button
}
>
<
VerifiedUserIcon
className
=
{
classes
[
moderClass
]}
/
>
<
/IconButton
>
<
/MyBadge
>
...
...
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