Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • advertisement
  • automagic
  • dbp-translation-component
  • demo
  • demo-file-handling
  • favorites-and-recent-files
  • icon-set-mapping
  • lit2
  • main
  • person-select-custom
  • port-i18next-parser
  • publish
  • remove-sentry
  • renovate/lock-file-maintenance
  • revert-6c632dc6
  • wc-part
  • wip-cleanup
17 results

Target

Select target project
  • 987FCF504483CBC8/toolkit
1 result
Select Git revision
  • advertisement
  • automagic
  • dbp-translation-component
  • demo
  • demo-file-handling
  • favorites-and-recent-files
  • icon-set-mapping
  • lit2
  • main
  • person-select-custom
  • port-i18next-parser
  • publish
  • remove-sentry
  • renovate/lock-file-maintenance
  • revert-6c632dc6
  • wc-part
  • wip-cleanup
17 results
Show changes
Commits on Source (1)
......@@ -1637,44 +1637,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
}
})
.catch((error) => {
this.loading = false;
if(error.response && error.response.status) {
switch (error.response.status) {
case 403:
this.statusText = html`
<span class="error">
<dbp-icon name="warning-high"></dbp-icon>
${i18n.t('nextcloud-file-picker.forbidden')}
</span>`;
return;
case 415:
this.statusText = html`
<span class="error">
<dbp-icon name="warning-high"></dbp-icon>
${i18n.t('nextcloud-file-picker.file-error')}
</span>`;
this.sendSetPropertyEvent('analytics-event', {
category: 'FileHandlingNextcloud',
action: 'UploadFilesPutfilesError',
name: "415",
});
return;
default:
break;
}
}
this.statusText = html`
<span class="error">
<dbp-icon name="warning-high"></dbp-icon>
${i18n.t('nextcloud-file-picker.file-upload-error')}
</span>`;
this.sendSetPropertyEvent('analytics-event', {
category: 'FileHandlingNextcloud',
action: 'UploadFilesPutfilesError',
name: error,
});
console.error(error);
this.uploadError(error);
});
} else {
this.loadDirectory(this.directoryPath);
......@@ -1695,6 +1658,48 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
}
}
uploadError(error) {
const i18n = this._i18n;
this.loading = false;
if(error.response && error.response.status) {
switch (error.response.status) {
case 403:
this.statusText = html`
<span class="error">
<dbp-icon name="warning-high"></dbp-icon>
${i18n.t('nextcloud-file-picker.forbidden')}
</span>`;
return;
case 415:
this.statusText = html`
<span class="error">
<dbp-icon name="warning-high"></dbp-icon>
${i18n.t('nextcloud-file-picker.file-error')}
</span>`;
this.sendSetPropertyEvent('analytics-event', {
category: 'FileHandlingNextcloud',
action: 'UploadFilesPutfilesError',
name: "415",
});
return;
default:
break;
}
}
this.statusText = html`
<span class="error">
<dbp-icon name="warning-high"></dbp-icon>
${i18n.t('nextcloud-file-picker.file-upload-error')}
</span>`;
this.sendSetPropertyEvent('analytics-event', {
category: 'FileHandlingNextcloud',
action: 'UploadFilesPutfilesError',
name: error,
});
console.error(error);
}
/**
* Upload a file after a conflict happens on webdav side
*
......@@ -1766,7 +1771,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
this.replaceModalDialog(file, directory);
}
} else {
throw error;
this.uploadError(error);
}
});
......