IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dissolve_admin_resolver

Browse Source
This commit is contained in:
Ulf Gebhardt 2022-11-30 17:19:02 +01:00 committed by GitHub
commit 37ffbd28b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
View File

@ -38,10 +38,12 @@ export default {
form: { form: {
text: '', text: '',
}, },
loading: false,
} }
}, },
methods: { methods: {
onSubmit(event) { onSubmit(event) {
this.loading = true
this.$apollo this.$apollo
.mutate({ .mutate({
mutation: adminCreateContributionMessage, mutation: adminCreateContributionMessage,
@ -55,9 +57,11 @@ export default {
this.$emit('update-state', this.contributionId) this.$emit('update-state', this.contributionId)
this.form.text = '' this.form.text = ''
this.toastSuccess(this.$t('message.request')) this.toastSuccess(this.$t('message.request'))
this.loading = false
}) })
.catch((error) => { .catch((error) => {
this.toastError(error.message) this.toastError(error.message)
this.loading = false
}) })
}, },
onReset(event) { onReset(event) {
@ -66,10 +70,7 @@ export default {
}, },
computed: { computed: {
disabled() { disabled() {
if (this.form.text !== '') { return this.form.text === '' || this.loading
return false
}
return true
}, },
}, },
} }

8
backend/Dockerfile
View File

@ -98,10 +98,18 @@ COPY --from=build ${DOCKER_WORKDIR}/../database/build ../database/build
# We also copy the node_modules express and serve-static for the run script # We also copy the node_modules express and serve-static for the run script
COPY --from=build ${DOCKER_WORKDIR}/node_modules ./node_modules COPY --from=build ${DOCKER_WORKDIR}/node_modules ./node_modules
COPY --from=build ${DOCKER_WORKDIR}/../database/node_modules ../database/node_modules COPY --from=build ${DOCKER_WORKDIR}/../database/node_modules ../database/node_modules
# Copy static files # Copy static files
# COPY --from=build ${DOCKER_WORKDIR}/public ./public # COPY --from=build ${DOCKER_WORKDIR}/public ./public
# Copy package.json for script definitions (lock file should not be needed) # Copy package.json for script definitions (lock file should not be needed)
COPY --from=build ${DOCKER_WORKDIR}/package.json ./package.json COPY --from=build ${DOCKER_WORKDIR}/package.json ./package.json
# Copy tsconfig.json to provide alias path definitions
COPY --from=build ${DOCKER_WORKDIR}/tsconfig.json ./tsconfig.json
# Copy log4js-config.json to provide log configuration
COPY --from=build ${DOCKER_WORKDIR}/log4js-config.json ./log4js-config.json
# Copy memonic type since its referenced in the sources
# TODO: remove
COPY --from=build ${DOCKER_WORKDIR}/src/config/mnemonic.uncompressed_buffer13116.txt ./src/config/mnemonic.uncompressed_buffer13116.txt
# Copy run scripts run/ # Copy run scripts run/
# COPY --from=build ${DOCKER_WORKDIR}/run ./run # COPY --from=build ${DOCKER_WORKDIR}/run ./run

9
frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
View File

@ -38,10 +38,12 @@ export default {
form: { form: {
text: '', text: '',
}, },
isSubmitting: false,
} }
}, },
methods: { methods: {
onSubmit() { onSubmit() {
this.isSubmitting = true
this.$apollo this.$apollo
.mutate({ .mutate({
mutation: createContributionMessage, mutation: createContributionMessage,
@ -55,9 +57,11 @@ export default {
this.$emit('update-state', this.contributionId) this.$emit('update-state', this.contributionId)
this.form.text = '' this.form.text = ''
this.toastSuccess(this.$t('message.reply')) this.toastSuccess(this.$t('message.reply'))
this.isSubmitting = false
}) })
.catch((error) => { .catch((error) => {
this.toastError(error.message) this.toastError(error.message)
this.isSubmitting = false
}) })
}, },
onReset() { onReset() {
@ -66,10 +70,7 @@ export default {
}, },
computed: { computed: {
disabled() { disabled() {
if (this.form.text !== '') { return this.form.text === '' || this.isSubmitting
return false
}
return true
}, },
}, },
} }