Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
in-sylva.search.app
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
in-sylva development
in-sylva.search.app
Commits
c590e2ab
Commit
c590e2ab
authored
3 months ago
by
BISSON REMI
Browse files
Options
Downloads
Patches
Plain Diff
[MyProfile] replaced empty table by a warning message when user has no requests
parent
5bb5ed35
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!41
Merge develop into master
,
!39
Add results display settings in user profile page
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
public/locales/en/profile.json
+2
-1
2 additions, 1 deletion
public/locales/en/profile.json
public/locales/fr/profile.json
+3
-2
3 additions, 2 deletions
public/locales/fr/profile.json
src/pages/profile/MyProfile.js
+7
-1
7 additions, 1 deletion
src/pages/profile/MyProfile.js
with
12 additions
and
4 deletions
public/locales/en/profile.json
+
2
−
1
View file @
c590e2ab
...
...
@@ -48,7 +48,8 @@
"requestsMessage"
:
"Message"
,
"processed"
:
"Processed"
,
"cancelRequest"
:
"Cancel this request"
,
"requestCanceled"
:
"Request deleted"
"requestCanceled"
:
"Request deleted"
,
"noCurrentRequest"
:
"You don't have any pending requests."
},
"groupRequests"
:
{
"selectGroup"
:
"Select group(s)"
,
...
...
This diff is collapsed.
Click to expand it.
public/locales/fr/profile.json
+
3
−
2
View file @
c590e2ab
...
...
@@ -3,7 +3,7 @@
"profile"
:
"Mon profil utilisateur"
,
"groups"
:
"Mes groupes"
,
"role"
:
"Mon role"
,
"fieldsDisplaySettings"
:
"
Paramétrage
des résultats de recherche"
"fieldsDisplaySettings"
:
"
Visualisation
des résultats de recherche"
},
"myProfile"
:
{
"groupPanel"
:
{
...
...
@@ -48,7 +48,8 @@
"requestsMessage"
:
"Message"
,
"processed"
:
"Traitée"
,
"cancelRequest"
:
"Annuler cette requête"
,
"requestCanceled"
:
"Requête supprimée"
"requestCanceled"
:
"Requête supprimée"
,
"noCurrentRequest"
:
"Vous n'avez pas de requêtes en cours."
},
"groupRequests"
:
{
"selectGroup"
:
"Selectionnez un groupe"
,
...
...
This diff is collapsed.
Click to expand it.
src/pages/profile/MyProfile.js
+
7
−
1
View file @
c590e2ab
...
...
@@ -147,7 +147,13 @@ const MyProfile = ({
<
/MyProfileCustomPanel
>
<
/EuiFlexGroup
>
<
MyProfileCustomPanel
title
=
{
t
(
'
profile:myProfile.requestsPanel.title
'
)}
>
<
EuiBasicTable
items
=
{
userRequests
}
columns
=
{
requestsColumns
}
/
>
{
userRequests
.
length
!==
0
?
(
<
EuiBasicTable
items
=
{
userRequests
}
columns
=
{
requestsColumns
}
/
>
)
:
(
<
EuiFlexGroup
justifyContent
=
{
'
center
'
}
>
<
p
>
{
t
(
'
profile:requestsList.noCurrentRequest
'
)}
<
/p
>
<
/EuiFlexGroup
>
)}
<
/MyProfileCustomPanel
>
<
EuiFlexGroup
>
<
MyProfileCustomPanel
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment