mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #25351 from nextcloud/backport/25185/stable19 

[stable19] Show the actual error on share requests
This commit is contained in:
John Molakvoæ 2021-04-01 13:54:22 +02:00 committed by GitHub
parent bfe4a84ca7 f75e7e7b54
commit d6889a7139
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files_sharing/js/dist/files_sharing_tab.js vendored
View File

File diff suppressed because one or more lines are too long

2
apps/files_sharing/js/dist/files_sharing_tab.js.map vendored
View File

File diff suppressed because one or more lines are too long

18
apps/files_sharing/src/mixins/ShareRequests.js
View File

@ -59,7 +59,11 @@ export default {
return new Share(request.data.ocs.data) return new Share(request.data.ocs.data)
} catch (error) { } catch (error) {
console.error('Error while creating share', error) console.error('Error while creating share', error)
OC.Notification.showTemporary(t('files_sharing', 'Error creating the share'), { type: 'error' }) const errorMessage = error?.response?.data?.ocs?.meta?.message
OC.Notification.showTemporary(
errorMessage ? t('files_sharing', 'Error creating the share: {errorMessage}', { errorMessage }) : t('files_sharing', 'Error creating the share'),
{ type: 'error' }
)
throw error throw error
} }
}, },
@ -79,7 +83,11 @@ export default {
return true return true
} catch (error) { } catch (error) {
console.error('Error while deleting share', error) console.error('Error while deleting share', error)
OC.Notification.showTemporary(t('files_sharing', 'Error deleting the share'), { type: 'error' }) const errorMessage = error?.response?.data?.ocs?.meta?.message
OC.Notification.showTemporary(
errorMessage ? t('files_sharing', 'Error deleting the share: {errorMessage}', { errorMessage }) : t('files_sharing', 'Error deleting the share'),
{ type: 'error' }
)
throw error throw error
} }
}, },
@ -100,7 +108,11 @@ export default {
} catch (error) { } catch (error) {
console.error('Error while updating share', error) console.error('Error while updating share', error)
if (error.response.status !== 400) { if (error.response.status !== 400) {
OC.Notification.showTemporary(t('files_sharing', 'Error updating the share'), { type: 'error' }) const errorMessage = error?.response?.data?.ocs?.meta?.message
OC.Notification.showTemporary(
errorMessage ? t('files_sharing', 'Error updating the share: {errorMessage}', { errorMessage }) : t('files_sharing', 'Error updating the share'),
{ type: 'error' }
)
} }
const message = error.response.data.ocs.meta.message const message = error.response.data.ocs.meta.message
throw new Error(message) throw new Error(message)