iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix back button on shift create preview

This commit is contained in:
msquare 2019-08-19 22:04:52 +02:00
parent 2e0c82ea05
commit a5f838d56a
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
includes/pages/admin_shifts.php
View File

@ -129,7 +129,8 @@ function admin_shifts()
$valid = false; $valid = false;
error(__('Please split the shift-change hours by colons.')); error(__('Please split the shift-change hours by colons.'));
} }
$shift_over_midnight = $request->has('shift_over_midnight'); $shift_over_midnight = $request->has('shift_over_midnight')
&& $request->input('shift_over_midnight') != 'false';
} }
} else { } else {
$valid = false; $valid = false;
@ -328,13 +329,14 @@ function admin_shifts()
form_hidden('length', $length), form_hidden('length', $length),
form_hidden('change_hours', implode(', ', $change_hours)), form_hidden('change_hours', implode(', ', $change_hours)),
form_hidden('angelmode', $angelmode), form_hidden('angelmode', $angelmode),
form_submit('back', __('back')), form_hidden('shift_over_midnight', $shift_over_midnight ? 'true' : 'false'),
form_submit('back', glyph('menu-left') . __('back')),
table([ table([
'timeslot' => __('Time and location'), 'timeslot' => __('Time and location'),
'title' => __('Type and title'), 'title' => __('Type and title'),
'needed_angels' => __('Needed angels') 'needed_angels' => __('Needed angels')
], $shifts_table), ], $shifts_table),
form_submit('submit', __('Save')) form_submit('submit', glyph('floppy-disk') . __('Save'))
]) ])
]); ]);
} }
@ -437,7 +439,7 @@ function admin_shifts()
'change_hours', 'change_hours',
__('Shift change hours'), __('Shift change hours'),
$request->has('change_hours') $request->has('change_hours')
? $request->input('input') ? $request->input('change_hours')
: '00, 04, 08, 10, 12, 14, 16, 18, 20, 22' : '00, 04, 08, 10, 12, 14, 16, 18, 20, 22'
), ),
form_checkbox( form_checkbox(
@ -465,7 +467,7 @@ function admin_shifts()
]) ])
]) ])
]), ]),
form_submit('preview', __('Preview')) form_submit('preview', glyph('search') . __('Preview'))
]) ])
]); ]);
} }