Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-jams
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-jams
Commits
38245355
Commit
38245355
authored
4 years ago
by
Ndèye Anna Ndiaye
Committed by
Larbi Gharib
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
contact list should not contain self user
Change-Id: Ibf7598bf88fd699f56a010586e1c060d8a346dfb
parent
cebf84df
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
jams-react-client/src/components/Drawer/Drawer.js
+10
-1
10 additions, 1 deletion
jams-react-client/src/components/Drawer/Drawer.js
jams-react-client/src/views/Contacts/Contacts.js
+0
-14
0 additions, 14 deletions
jams-react-client/src/views/Contacts/Contacts.js
with
10 additions
and
15 deletions
jams-react-client/src/components/Drawer/Drawer.js
+
10
−
1
View file @
38245355
...
...
@@ -45,7 +45,16 @@ export default function TemporaryDrawer(props) {
* Get users list to pass to the drawer to add contacts to user or users to group
*/
axios
(
configApiCall
(
api_path_get_user_directory_search
,
'
GET
'
,
{
"
queryString
"
:
"
*
"
},
null
)).
then
((
response
)
=>
{
setUsers
(
response
.
data
)
let
resp
=
response
.
data
if
(
!
addingToGroup
){
let
contacts
=
resp
.
filter
((
data
)
=>
{
if
(
data
.
username
!==
props
.
username
)
return
data
})
setUsers
(
contacts
);
}
else
setUsers
(
resp
);
}).
catch
((
error
)
=>
{
console
.
log
(
error
);
if
(
error
.
response
.
status
==
401
){
...
...
This diff is collapsed.
Click to expand it.
jams-react-client/src/views/Contacts/Contacts.js
+
0
−
14
View file @
38245355
import
React
,
{
useState
,
useEffect
}
from
"
react
"
;
import
{
useHistory
}
from
'
react-router-dom
'
;
import
{
Switch
,
Route
,
Redirect
}
from
"
react-router-dom
"
;
// @material-ui/core components
import
{
makeStyles
}
from
"
@material-ui/core/styles
"
;
import
InputLabel
from
"
@material-ui/core/InputLabel
"
;
// core components
import
GridItem
from
"
components/Grid/GridItem.js
"
;
import
GridContainer
from
"
components/Grid/GridContainer.js
"
;
import
CustomInput
from
"
components/CustomInput/CustomInput.js
"
;
import
Button
from
"
components/CustomButtons/Button.js
"
;
import
Card
from
"
components/Card/Card.js
"
;
import
CardHeader
from
"
components/Card/CardHeader.js
"
;
import
CardAvatar
from
"
components/Card/CardAvatar.js
"
;
import
CardBody
from
"
components/Card/CardBody.js
"
;
import
CardFooter
from
"
components/Card/CardFooter.js
"
;
import
UserProfile
from
"
views/UserProfile/UserProfile.js
"
import
Divider
from
'
@material-ui/core/Divider
'
;
import
PersonIcon
from
'
@material-ui/icons/Person
'
;
import
PermIdentityIcon
from
'
@material-ui/icons/PermIdentity
'
;
import
PhoneOutlinedIcon
from
'
@material-ui/icons/PhoneOutlined
'
;
import
BusinessOutlinedIcon
from
'
@material-ui/icons/BusinessOutlined
'
;
import
Search
from
"
@material-ui/icons/Search
"
;
import
IconButton
from
'
@material-ui/core/IconButton
'
;
import
MailOutlineIcon
from
'
@material-ui/icons/MailOutline
'
;
import
axios
from
"
axios
"
;
import
configApiCall
from
"
api.js
"
;
import
auth
from
'
auth.js
'
import
{
api_path_get_auth_contacts
,
api_path_get_admin_contacts
,
api_path_delete_auth_contacts
,
api_path_delete_admin_contacts
}
from
"
globalUrls
"
;
import
AddCircleOutlineIcon
from
'
@material-ui/icons/AddCircleOutline
'
;
import
KeyboardReturnIcon
from
'
@material-ui/icons/KeyboardReturn
'
;
import
DeleteOutlineIcon
from
'
@material-ui/icons/DeleteOutline
'
;
import
jami
from
"
assets/img/faces/jami.png
"
;
import
noProfilePicture
from
"
assets/img/faces/no-profile-picture.png
"
;
import
EditCreateUserProfile
from
"
views/UserProfile/EditCreateUserProfile
"
;
import
LinearProgress
from
'
@material-ui/core/LinearProgress
'
;
import
headerLinksStyle
from
"
assets/jss/material-dashboard-react/components/headerLinksStyle.js
"
;
import
TemporaryDrawer
from
"
components/Drawer/Drawer
"
import
Dialog
from
'
@material-ui/core/Dialog
'
;
import
DialogActions
from
'
@material-ui/core/DialogActions
'
;
import
DialogContent
from
'
@material-ui/core/DialogContent
'
;
...
...
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