aboutsummaryrefslogtreecommitdiff
path: root/modern/src/settings/UserPage.js
diff options
context:
space:
mode:
authorAnton Tananaev <anton@traccar.org>2022-05-15 13:04:00 -0700
committerAnton Tananaev <anton@traccar.org>2022-05-15 13:04:00 -0700
commit6af8b218a1d9be4d8dcf6a8398b08c874d8a12dc (patch)
tree8712dcf947f4e6fa0795faa4667e9bb787775d72 /modern/src/settings/UserPage.js
parent5faf345b841da9af97a45cc057a58b63b2379388 (diff)
downloadtrackermap-web-6af8b218a1d9be4d8dcf6a8398b08c874d8a12dc.tar.gz
trackermap-web-6af8b218a1d9be4d8dcf6a8398b08c874d8a12dc.tar.bz2
trackermap-web-6af8b218a1d9be4d8dcf6a8398b08c874d8a12dc.zip
Update known attributes
Diffstat (limited to 'modern/src/settings/UserPage.js')
-rw-r--r--modern/src/settings/UserPage.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/modern/src/settings/UserPage.js b/modern/src/settings/UserPage.js
index 1fb7103f..10e49690 100644
--- a/modern/src/settings/UserPage.js
+++ b/modern/src/settings/UserPage.js
@@ -14,6 +14,7 @@ import useUserAttributes from '../common/attributes/useUserAttributes';
import { sessionActions } from '../store';
import SelectField from '../common/components/SelectField';
import SettingsMenu from './components/SettingsMenu';
+import useCommonUserAttributes from '../common/attributes/useCommonUserAttributes';
const useStyles = makeStyles(() => ({
details: {
@@ -28,6 +29,7 @@ const UserPage = () => {
const currentUserId = useSelector((state) => state.session.user.id);
+ const commonUserAttributes = useCommonUserAttributes(t);
const userAttributes = useUserAttributes(t);
const [item, setItem] = useState();
@@ -159,7 +161,7 @@ const UserPage = () => {
<EditAttributesView
attributes={item.attributes}
setAttributes={(attributes) => setItem({ ...item, attributes })}
- definitions={userAttributes}
+ definitions={{ ...commonUserAttributes, ...userAttributes }}
/>
</AccordionDetails>
</Accordion>