merge fixes

This commit is contained in:
Čarodej
2022-01-24 08:35:58 +01:00
parent 4396965d4d
commit 3677e51c8f
9 changed files with 401 additions and 1078 deletions

View File

@@ -192,7 +192,7 @@ const actions = {
commit('SHIFT_FROM_FILE_QUEUE')
// Check if user is in uploading folder, if yes, than show new file
if ((! getters.currentFolder && !response.data.data.attributes.parent_id) || response.data.data.attributes.parent_id === getters.currentFolder.data.id) {
if ((! getters.currentFolder && !response.data.data.attributes.parent_id) || (getters.currentFolder && response.data.data.attributes.parent_id === getters.currentFolder.data.id)) {
// Add uploaded item into view
commit('ADD_NEW_ITEMS', response.data)
@@ -221,7 +221,9 @@ const actions = {
.catch(error => {
reject(error)
let messages = {
console.log(error);
/* let messages = {
'423': {
title: i18n.t('popup_exceed_limit.title'),
message: i18n.t('popup_exceed_limit.message')
@@ -235,7 +237,7 @@ const actions = {
message: i18n.t('popup_paylod_error.message')
},
'401': {
title: error.response.data.message,
//title: error.response.data.message,
},
}
@@ -243,7 +245,7 @@ const actions = {
emoji: '😬😬😬',
title: messages[error.response.status]['title'],
message: messages[error.response.status]['message'] || null
})
})*/
commit('PROCESSING_FILE', false)
commit('CLEAR_UPLOAD_PROGRESS')