Skip to content
Snippets Groups Projects
Commit 92874a55 authored by Moritz Strohm's avatar Moritz Strohm
Browse files

fixed creating new all-day events, fixes #4657

Closes #4657

Merge request studip/studip!3482
parent 35942fd7
No related branches found
No related tags found
No related merge requests found
...@@ -230,6 +230,12 @@ class Calendar_DateController extends AuthenticatedController ...@@ -230,6 +230,12 @@ class Calendar_DateController extends AuthenticatedController
$this->date->begin = Request::get('begin'); $this->date->begin = Request::get('begin');
$this->date->end = Request::get('end'); $this->date->end = Request::get('end');
$this->date->repetition_end = $this->date->end; $this->date->repetition_end = $this->date->end;
} elseif (Request::submitted('begin_str') && Request::submitted('end_str')) {
//Assume the textual format d.m.Y H:i:
$begin = Request::getDateTime('begin_str', 'd.m.Y H:i');
$end = Request::getDateTime('end_str', 'd.m.Y H:i');
$this->date->begin = $begin->getTimestamp();
$this->date->end = $end->getTimestamp();
} else { } else {
$time = new DateTime(); $time = new DateTime();
if (Request::submitted('timestamp')) { if (Request::submitted('timestamp')) {
...@@ -393,8 +399,8 @@ class Calendar_DateController extends AuthenticatedController ...@@ -393,8 +399,8 @@ class Calendar_DateController extends AuthenticatedController
} }
$this->date->editor_id = $GLOBALS['user']->id; $this->date->editor_id = $GLOBALS['user']->id;
$begin = Request::getDateTime('begin', 'd.m.Y H:i'); $begin = Request::getDateTime('begin_str', 'd.m.Y H:i');
$end = Request::getDateTime('end', 'd.m.Y H:i'); $end = Request::getDateTime('end_str', 'd.m.Y H:i');
if (Request::get('all_day') === '1') { if (Request::get('all_day') === '1') {
$this->all_day_event = true; $this->all_day_event = true;
$begin->setTime(0,0,0); $begin->setTime(0,0,0);
......
...@@ -69,13 +69,13 @@ ...@@ -69,13 +69,13 @@
<label class="studiprequired"> <label class="studiprequired">
<?= _('Beginn') ?> <?= _('Beginn') ?>
<span class="asterisk" title="<?= _('Dies ist ein Pflichtfeld') ?>" aria-hidden="true">*</span> <span class="asterisk" title="<?= _('Dies ist ein Pflichtfeld') ?>" aria-hidden="true">*</span>
<input type="text" name="begin" class="begin-input" data-datetime-picker <input type="text" name="begin_str" class="begin-input" data-datetime-picker
required="required" value="<?= date('d.m.Y H:i', $date->begin) ?>"> required="required" value="<?= date('d.m.Y H:i', $date->begin) ?>">
</label> </label>
<label class="studiprequired"> <label class="studiprequired">
<?= _('Ende') ?> <?= _('Ende') ?>
<span class="asterisk" title="<?= _('Dies ist ein Pflichtfeld') ?>" aria-hidden="true">*</span> <span class="asterisk" title="<?= _('Dies ist ein Pflichtfeld') ?>" aria-hidden="true">*</span>
<input type="text" name="end" class="end-input" data-datetime-picker <input type="text" name="end_str" class="end-input" data-datetime-picker
required="required" value="<?= date('d.m.Y H:i', $date->end) ?>"> required="required" value="<?= date('d.m.Y H:i', $date->end) ?>">
</label> </label>
</div> </div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment