upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-22 14:50:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 53

Fix default phone region validation

Browse source 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
This commit is contained in:
Christopher Ng 2023-01-05 00:23:49 +00:00 committed by nextcloud-command
parent 4694287410
commit 9bcfa5ecba
4 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/settings/lib/Settings/Personal/PersonalInfo.php
View file

@ -154,6 +154,7 @@ class PersonalInfo implements ISettings {
'displayName' => $this->getProperty($account, IAccountManager::PROPERTY_DISPLAYNAME),
'emailMap' => $this->getEmailMap($account),
'phone' => $this->getProperty($account, IAccountManager::PROPERTY_PHONE),
'defaultPhoneRegion' => $this->config->getSystemValueString('default_phone_region'),
'location' => $this->getProperty($account, IAccountManager::PROPERTY_ADDRESS),
'website' => $this->getProperty($account, IAccountManager::PROPERTY_WEBSITE),
'twitter' => $this->getProperty($account, IAccountManager::PROPERTY_TWITTER),

8
apps/settings/src/components/PersonalInfo/PhoneSection.vue
View file

@ -35,7 +35,10 @@ import AccountPropertySection from './shared/AccountPropertySection.vue'
import { NAME_READABLE_ENUM } from '../../constants/AccountPropertyConstants.js'
const { phone } = loadState('settings', 'personalInfoParameters', {})
const {
defaultPhoneRegion,
phone,
} = loadState('settings', 'personalInfoParameters', {})
export default {
name: 'PhoneSection',
@ -52,6 +55,9 @@ export default {
methods: {
onValidate(value) {
if (defaultPhoneRegion) {
return isValidPhoneNumber(value, defaultPhoneRegion)
}
return isValidPhoneNumber(value)
},
},

4
dist/settings-vue-settings-personal-info.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/settings-vue-settings-personal-info.js.map vendored
View file

File diff suppressed because one or more lines are too long