vikunja
/
frontend
Archived
6
39
Fork 49
Code Issues 1 Pull Requests 4 Projects Releases 26 Activity

Merge branch 'main' into fix/vue3 

# Conflicts:
#	src/views/list/settings/edit.vue
This commit is contained in:
Dominik Pschenitschni 2021-10-03 13:24:17 +02:00
parent 0cbffad49d 3f9917dfab
commit 34d0f28678
Signed by: dpschen
GPG Key ID: B257AC0149F43A77
15 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.drone.yml
View File

@ -127,7 +127,7 @@ steps:
- build-dev
- name: upload-test-results
image: plugins/s3:1
image: plugins/s3
pull: true
settings:
bucket: drone-test-results
@ -210,7 +210,7 @@ steps:
depends_on: [ build ]
- name: release
image: plugins/s3:1
image: plugins/s3
pull: true
settings:
bucket: vikunja-releases
@ -285,7 +285,7 @@ steps:
depends_on: [ build ]
- name: release
image: plugins/s3:1
image: plugins/s3
pull: true
settings:
bucket: vikunja-releases

2
cypress.json
View File

@ -2,7 +2,7 @@
"baseUrl": "http://localhost:5000",
"env": {
"API_URL": "http://localhost:3456/api/v1",
"TEST_SECRET": "testingS3cr3et"
"TEST_SECRET": "averyLongSecretToSe33dtheDB"
},
"video": false,
"retries": {

4
cypress/docker-compose.yml
View File

@ -2,10 +2,12 @@ version: '3'
services:
api:
image: vikunja/api
image: vikunja/api:unstable
environment:
VIKUNJA_LOG_LEVEL: DEBUG
VIKUNJA_SERVICE_TESTINGTOKEN: averyLongSecretToSe33dtheDB
ports:
- 3456:3456
cypress:
image: cypress/browsers:node12.18.3-chrome87-ff82
volumes:

2
src/i18n/lang/de-DE.json
View File

@ -128,7 +128,7 @@
}
},
"list": {
"archived": "Diese Liste ist archiviert. Es ist nicht möglich, neue Aufgaben zu erstellen oder sie zu bearbeiten.",
"archived": "This list is archived. It is not possible to create new or edit tasks for it.",
"title": "Listentitel",
"color": "Farbe",
"lists": "Listen",

2
src/i18n/lang/de-swiss.json
View File

@ -128,7 +128,7 @@
}
},
"list": {
"archived": "Die Liste isch archiviert. Es isch nid möglich e neui Uufgab drin z'erstelle oder z'bearbeite.",
"archived": "This list is archived. It is not possible to create new or edit tasks for it.",
"title": "Liste Titl",
"color": "Farb",
"lists": "Listene",

2
src/i18n/lang/en.json
View File

@ -128,7 +128,7 @@
}
},
"list": {
"archived": "This list is archived. It is not possible to create new or edit tasks or it.",
"archived": "This list is archived. It is not possible to create new or edit tasks for it.",
"title": "List Title",
"color": "Color",
"lists": "Lists",

2
src/i18n/lang/es-ES.json
View File

@ -128,7 +128,7 @@
}
},
"list": {
"archived": "This list is archived. It is not possible to create new or edit tasks or it.",
"archived": "This list is archived. It is not possible to create new or edit tasks for it.",
"title": "List Title",
"color": "Color",
"lists": "Lists",

10
src/i18n/lang/fr-FR.json
View File

@ -98,8 +98,8 @@
"setSuccess": "Avatar défini."
},
"quickAddMagic": {
"title": "Quick Add Magic Mode",
"disabled": "Disabled",
"title": "Ajout rapide en mode magique",
"disabled": "Désactivé",
"todoist": "Todoist",
"vikunja": "Vikunja"
}
@ -499,8 +499,8 @@
"doneSuccess": "Tâche marquée comme terminée.",
"undoneSuccess": "Tâche marquée comme non terminée.",
"openDetail": "Ouvrir la vue détaillée de la tâche",
"checklistTotal": "{checked} of {total} tasks",
"checklistAllDone": "{total} tasks",
"checklistTotal": "{checked} sur {total} tâches",
"checklistAllDone": "{total} tâches",
"show": {
"titleCurrent": "Tâches actuelles",
"titleDates": "Tâches du {from} au {to}",
@ -673,7 +673,7 @@
"label4": "Par exemple : {prefix}\"Étiquette avec espaces\".",
"priority1": "Pour définir la priorité d’une tâche, ajoutez un chiffre de 1 à 5, précédé d’un {prefix}.",
"priority2": "Plus le numéro est élevé, plus la priorité est élevée.",
"assignees": "To directly assign the task to a user, add their username prefixed with {prefix} to the task.",
"assignees": "Pour assigner directement la tâche à un utilisateur, ajoutez son nom d'utilisateur préfixé avec {prefix} à la tâche.",
"list1": "Pour définir une liste dans laquelle la tâche doit apparaître, entrez son nom précédé de {prefix}.",
"list2": "Ceci renverra une erreur si la liste n’existe pas.",
"dateAndTime": "Date et heure",

2
src/i18n/lang/it-IT.json
View File

@ -128,7 +128,7 @@
}
},
"list": {
"archived": "This list is archived. It is not possible to create new or edit tasks or it.",
"archived": "This list is archived. It is not possible to create new or edit tasks for it.",
"title": "List Title",
"color": "Color",
"lists": "Lists",

2
src/i18n/lang/nl-NL.json
View File

@ -128,7 +128,7 @@
}
},
"list": {
"archived": "This list is archived. It is not possible to create new or edit tasks or it.",
"archived": "This list is archived. It is not possible to create new or edit tasks for it.",
"title": "List Title",
"color": "Color",
"lists": "Lists",

2
src/i18n/lang/pt-BR.json
View File

@ -128,7 +128,7 @@
}
},
"list": {
"archived": "This list is archived. It is not possible to create new or edit tasks or it.",
"archived": "This list is archived. It is not possible to create new or edit tasks for it.",
"title": "List Title",
"color": "Color",
"lists": "Lists",

2
src/i18n/lang/pt-PT.json
View File

@ -128,7 +128,7 @@
}
},
"list": {
"archived": "This list is archived. It is not possible to create new or edit tasks or it.",
"archived": "This list is archived. It is not possible to create new or edit tasks for it.",
"title": "List Title",
"color": "Color",
"lists": "Lists",

2
src/i18n/lang/ro-RO.json
View File

@ -128,7 +128,7 @@
}
},
"list": {
"archived": "This list is archived. It is not possible to create new or edit tasks or it.",
"archived": "This list is archived. It is not possible to create new or edit tasks for it.",
"title": "List Title",
"color": "Color",
"lists": "Lists",

2
src/i18n/lang/ru-RU.json
View File

@ -128,7 +128,7 @@
}
},
"list": {
"archived": "Этот список архивирован. В нём нелья создавать или изменять задачи.",
"archived": "This list is archived. It is not possible to create new or edit tasks for it.",
"title": "Название списка",
"color": "Цвет",
"lists": "Списки",

8
src/views/list/settings/edit.vue
View File

@ -71,7 +71,6 @@ import AsyncEditor from '@/components/input/AsyncEditor'
import ListModel from '@/models/list'
import ListService from '@/services/list'
import ColorPicker from '@/components/input/colorPicker.vue'
import ListDuplicateService from '@/services/listDuplicateService'
import {CURRENT_LIST} from '@/store/mutation-types'
import CreateEdit from '@/components/misc/create-edit.vue'
@ -81,7 +80,6 @@ export default {
return {
list: ListModel,
listService: new ListService(),
listDuplicateService: new ListDuplicateService(),
}
},
components: {
@ -101,9 +99,7 @@ export default {
this.listService.get(list)
.then(r => {
this.list = r
this.$store.commit(CURRENT_LIST, r)
this.setTitle(this.$t('list.edit.title', {list: this.list.title}))
this.list = { ...r }
})
.catch(e => {
this.$message.error(e)
@ -112,6 +108,8 @@ export default {
save() {
this.$store.dispatch('lists/updateList', this.list)
.then(() => {
this.$store.commit(CURRENT_LIST, this.list)
this.setTitle(this.$t('list.edit.title', {list: this.list.title}))
this.$message.success({message: this.$t('list.edit.success')})
this.$router.back()
})