TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-28 04:01:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-user-issue' into 'master'

Browse Source 
fix isLoading issue

See merge request mohit.panjvani/crater-web!646
This commit is contained in:
Mohit Panjwani
2020-12-22 06:43:23 +00:00
parent fe93d5236c c12e27dbfe
commit d07b63c365
1 changed files with 42 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
resources/assets/js/views/settings/UserProfileSetting.vue
View File

@ -313,7 +313,7 @@ export default {
name: this.formData.name, name: this.formData.name,
email: this.formData.email, email: this.formData.email,
} }
try {
if ( if (
this.formData.password != null && this.formData.password != null &&
this.formData.password !== undefined && this.formData.password !== undefined &&
@ -332,10 +332,6 @@ export default {
let languageRes = await this.updateUserSettings(languageData) let languageRes = await this.updateUserSettings(languageData)
// if(languageRes) {
// window.i18n.locale = this.language.code
// }
if (response.data.success) { if (response.data.success) {
this.isLoading = false this.isLoading = false
@ -349,6 +345,7 @@ export default {
data: this.previewAvatar, data: this.previewAvatar,
}) })
) )
this.uploadAvatar(avatarData) this.uploadAvatar(avatarData)
} }
@ -358,14 +355,11 @@ export default {
this.formData.password = '' this.formData.password = ''
this.formData.confirm_password = '' this.formData.confirm_password = ''
}
} catch (error) {
this.isLoading = false
return true return true
} }
window.toastr['error'](response.data.error)
this.isLoading = false
return true
}, },
}, },
} }