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 1923 and resolve conflict

Browse Source
This commit is contained in:
ogerly 2022-06-15 07:52:30 +02:00
commit 7e682425c5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/.eslintrc.js
View File

@ -39,7 +39,7 @@ module.exports = {
{
src: './src',
extensions: ['.js', '.vue'],
ignores: ['contributionLink.options.repetition.null'],
ignores: ['contributionLink.options.maxPerCycle.null'],
enableFix: false,
},
],

4
admin/src/components/ContributionLinkList.vue
View File

@ -57,8 +57,8 @@ export default {
'name',
'memo',
'amount',
'cycle',
'maxPerCycle',
{ key: 'cycle', label: 'Zyklus' },
{ key: 'maxPerCycle', label: 'Wiederholung' },
{ key: 'validFrom', label: 'Start' },
{ key: 'validTo', label: 'Ende' },
'delete',