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 'refactor_adminarea' into remove_self_creation_confirmation

Browse Source
This commit is contained in:
elweyn 2021-12-27 10:58:07 +01:00
commit bf049064c5
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
admin/src/components/CreationFormular.vue
View File

@ -171,14 +171,17 @@ export default {
currentMonth: {
short: this.$moment().format('MMMM'),
long: this.$moment().format('YYYY-MM-DD'),
year: this.$moment().format('YYYY'),
},
lastMonth: {
short: this.$moment().subtract(1, 'month').format('MMMM'),
long: this.$moment().subtract(1, 'month').format('YYYY-MM') + '-01',
year: this.$moment().subtract(1, 'month').format('YYYY'),
},
beforeLastMonth: {
short: this.$moment().subtract(2, 'month').format('MMMM'),
long: this.$moment().subtract(2, 'month').format('YYYY-MM') + '-01',
year: this.$moment().subtract(2, 'month').format('YYYY'),
},
submitObj: null,
isdisabled: true,
@ -190,7 +193,7 @@ export default {
// Auswählen eines Zeitraumes
updateRadioSelected(name, index, openCreation) {
this.createdIndex = index
this.text = 'Schöpfung für ' + name.short + ' ' + this.$moment().format('YYYY')
this.text = 'Schöpfung für ' + name.short + ' ' + name.year
// Wenn Mehrfachschöpfung
if (this.type === 'massCreation') {
// An Creation.vue emitten und radioSelectedMass aktualisieren

2
admin/src/pages/UserSearch.vue
View File

@ -42,7 +42,7 @@ export default {
{ key: 'lastName', label: 'Lastname' },
{
key: 'creation',
label: 'open Creation',
label: 'Open creations',
formatter: (value, key, item) => {
return (
`