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 2139-add-deleted-by-to-contributions

Browse Source
This commit is contained in:
Moriz Wahl 2022-10-13 17:23:21 +02:00 committed by GitHub
commit c4b61d70aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
admin/src/components/EditCreationFormular.vue
View File

@ -12,6 +12,7 @@
value-field="item" value-field="item"
text-field="name" text-field="name"
name="month-selection" name="month-selection"
:disabled="true"
></b-form-radio-group> ></b-form-radio-group>
</b-row> </b-row>
<div class="m-4"> <div class="m-4">

3
frontend/src/components/Contributions/ContributionForm.spec.js
View File

@ -329,7 +329,8 @@ describe('ContributionForm', () => {
describe('invalid form data', () => { describe('invalid form data', () => {
beforeEach(async () => { beforeEach(async () => {
await wrapper.findComponent({ name: 'BFormDatepicker' }).vm.$emit('input', now) // skip this precondition as long as the datepicker is disabled in the component
// await wrapper.findComponent({ name: 'BFormDatepicker' }).vm.$emit('input', now)
await wrapper.find('#contribution-amount').find('input').setValue('200') await wrapper.find('#contribution-amount').find('input').setValue('200')
}) })

1
frontend/src/components/Contributions/ContributionForm.vue
View File

@ -25,6 +25,7 @@
reset-value="" reset-value=""
:label-no-date-selected="$t('contribution.noDateSelected')" :label-no-date-selected="$t('contribution.noDateSelected')"
required required
:disabled="this.form.id !== null"
> >
<template #nav-prev-year><span></span></template> <template #nav-prev-year><span></span></template>
<template #nav-next-year><span></span></template> <template #nav-next-year><span></span></template>