v1.7 alpha.4

This commit is contained in:
carodej
2020-07-15 11:50:32 +02:00
parent 25d15390ef
commit 6b36480097
15 changed files with 222 additions and 209 deletions

View File

@@ -7521,6 +7521,53 @@
</concept_node>
</children>
</folder_node>
<folder_node>
<name>popup_deleted_user_aborted</name>
<children>
<concept_node>
<name>message</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>sk-SK</language>
<approved>false</approved>
</translation>
<translation>
<language>zh-CHS</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>title</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>sk-SK</language>
<approved>false</approved>
</translation>
<translation>
<language>zh-CHS</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
</children>
</folder_node>
<folder_node>
<name>popup_error</name>
<children>

View File

@@ -9,7 +9,7 @@ const Helpers = {
Vue.prototype.$updateText = debounce(function (route, name, value) {
if (! value || value === '') return
if (value === '') return
axios.patch(this.$store.getters.api + route, {name, value})
.catch(error => {

View File

@@ -478,6 +478,10 @@
"message": "Your user was deleted with all user data content.",
"title": "User was deleted"
},
"popup_deleted_user_aborted": {
"message": "You can't delete this account while user have active subscription.",
"title": "User wasn't deleted"
},
"popup_error": {
"message": "有什么东西坏掉了,请联系我们,引导我们修复。",
"title": "wow好像有什么东西坏掉了"

View File

@@ -478,6 +478,10 @@
"message": "Your user was deleted with all user data content.",
"title": "User was deleted"
},
"popup_deleted_user_aborted": {
"message": "You can't delete this account while user have active subscription.",
"title": "User wasn't deleted"
},
"popup_error": {
"message": "Something went wrong and we can't continue. Please contact us.",
"title": "Whooops, something went wrong!"

View File

@@ -478,6 +478,10 @@
"message": "Uživateľ bol vymazaný so všetkými uživateľskými dátami.",
"title": "Uživateľ bol vymazaný"
},
"popup_deleted_user_aborted": {
"message": "Nemôžte vymazať účet kým uživateľ má aktívne predplatné.",
"title": "Uživateľ nebol vymazaný"
},
"popup_error": {
"message": "Niečo sa stalo a nemôžme pokračovať. Prosím kontaktuj nás.",
"title": "Ups, niekde nastala chyba!"

View File

@@ -80,27 +80,36 @@
}
}
)
.then(() => {
this.isSendingRequest = false
.then((response) => {
// Show error message
events.$emit('success:open', {
emoji: '👍',
title: this.$t('popup_deleted_user.title'),
message: this.$t('popup_deleted_user.message'),
})
if (response.status === 202) {
events.$emit('alert:open', {
emoji: '☹️',
title: this.$t('popup_deleted_user_aborted.title'),
message: this.$t('popup_deleted_user_aborted.message'),
})
}
this.$router.push({name: 'Users'})
if (response.status === 200) {
events.$emit('success:open', {
emoji: '👍',
title: this.$t('popup_deleted_user.title'),
message: this.$t('popup_deleted_user.message'),
})
this.$router.push({name: 'Users'})
}
})
.catch(() => {
this.isSendingRequest = false
events.$emit('alert:open', {
title: this.$t('popup_error.title'),
message: this.$t('popup_error.message'),
})
})
.finally(() => {
this.isSendingRequest = false
})
}
},
}