diff --git a/jams-react-client/src/views/Blueprint/EditBlueprintPermissions.js b/jams-react-client/src/views/Blueprint/EditBlueprintPermissions.js index 4847d411dfaf3d5ec22df89572512ed4438e8160..d5fb210c9fff1aca4a6f24ce069fac92d3800ee5 100644 --- a/jams-react-client/src/views/Blueprint/EditBlueprintPermissions.js +++ b/jams-react-client/src/views/Blueprint/EditBlueprintPermissions.js @@ -210,7 +210,7 @@ export default function EditBlueprintPermissions(props) { setProxyEnabled(policyData["proxyEnabled"]); setProxyServer(policyData["proxyServer"]); setDhtProxyListUrl(); - setAllowLookup(policyData["autoAnswer"]); + setAllowLookup(policyData["allowLookup"]); policyData["defaultModerators"].split("/").forEach((id) => { if(id !== "undefined" && id !== ""){ diff --git a/jams-react-client/src/views/Contacts/Contacts.js b/jams-react-client/src/views/Contacts/Contacts.js index 6464f091ae780c2b07376d9d52640a1a82960e60..8124eaa7408958be004d0405be2a24b4777c6133 100644 --- a/jams-react-client/src/views/Contacts/Contacts.js +++ b/jams-react-client/src/views/Contacts/Contacts.js @@ -72,6 +72,9 @@ const styles = { loading: { width: "100%", }, + actionButtons: { + height: "3em", + } }; const useStyles = makeStyles(styles); @@ -88,6 +91,7 @@ export default function Users(props) { const [removedContact, setRemovedContact] = React.useState(); const [removedContactName, setRemovedContactName] = React.useState(); const [open, setOpen] = React.useState(false); + const [allowedToAdd, setAllowedToAdd] = React.useState(true); const searchContacts = (value) => { axios( @@ -118,6 +122,8 @@ export default function Users(props) { if (error.response.status === 401) { auth.authenticated = false; history.push("/"); + }else if(error.response.status === 403){ + setAllowedToAdd(false); } }); } @@ -366,7 +372,8 @@ export default function Users(props) { </Dialog> <GridContainer> <GridItem xs={12} sm={12} md={12}> - {auth.hasAdminScope() && <Button + <div className={classes.actionButtons}> + {allowedToAdd && <Button variant="contained" color="primary" href="#contained-buttons" @@ -376,6 +383,7 @@ export default function Users(props) { > <AddCircleOutlineIcon /> {i18next.t("add_a_contact", "Add contact")} </Button>} + </div> <div className={classes.searchWrapper}> <CustomInput formControlProps={{