hamlab/mobilizon-frontend
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch '308-fix-end-datetime-before-begin-datetime' into 'master'

Browse Source 
fix: end datetime can't be before begin datetime.

Closes #308

See merge request framasoft/mobilizon!343
This commit is contained in:
Thomas Citharel
2019-12-15 22:20:09 +01:00
parent 1e3fd8a1ca 3358da34f9
commit bf7720afc1
2 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
js/src/views/Event/Edit.vue
View File

@@ -22,7 +22,7 @@
<tag-input v-model="event.tags" :data="tags" path="title" />
<date-time-picker v-model="event.beginsOn" :label="$t('Starts on…')" />
<date-time-picker :min-date="minDateForEndsOn" v-model="event.endsOn" :label="$t('Ends on…')" />
<date-time-picker :min-datetime="event.beginsOn" v-model="event.endsOn" :label="$t('Ends on…')" />
<!-- <b-switch v-model="endsOnNull">{{ $t('No end date') }}</b-switch>-->
<b-button type="is-text" @click="dateSettingsIsOpen = true">{{ $t('Date parameters')}}</b-button>
@@ -630,7 +630,7 @@ export default class EditEvent extends Vue {
return JSON.stringify(this.event.toEditJSON()) !== JSON.stringify(this.unmodifiedEvent);
}
get beginsOn() { return this.event.beginsOn; }
get beginsOn(): Date { return this.event.beginsOn; }
@Watch('beginsOn', { deep: true })
onBeginsOnChanged(beginsOn) {
@@ -639,7 +639,7 @@ export default class EditEvent extends Vue {
const dateEndsOn = new Date(this.event.endsOn);
if (dateEndsOn < dateBeginsOn) {
this.event.endsOn = dateBeginsOn;
this.event.endsOn.setHours(dateEndsOn.getHours());
this.event.endsOn.setHours(dateBeginsOn.getHours() + 1);
}
if (dateEndsOn === dateBeginsOn) {
this.event.endsOn.setHours(dateEndsOn.getHours() + 1);