jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

toolbar - always allow to choose global activities (#410)

Browse Source
This commit is contained in:
Kevin Papst
2018-11-12 15:00:25 +01:00
committed by GitHub
parent e9cbb872d0
commit 540318fcd0
9 changed files with 93 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
assets/js/toolbar.js
View File

@@ -16,20 +16,13 @@ $(document).ready(function () {
$('.toolbar form select').change(function (event) {
switch (event.target.id) {
case 'customer':
if ($(this).val() === '') {
$('.toolbar form select#project').parent().remove();
//$('.toolbar form select#project').parent().parent().remove();
} else {
$('.toolbar form select#project').val('');
$('.toolbar form select#project').val('');
if ($('.toolbar form select#activity').find(':selected').attr('data-project')) {
$('.toolbar form select#activity').val('');
}
$('.toolbar form select#activity').parent().remove();
//$('.toolbar form select#activity').parent().parent().remove();
break;
case 'project':
if ($(this).val() === '') {
$('.toolbar form select#activity').parent().remove();
//$('.toolbar form select#activity').parent().parent().remove();
} else {
if ($('.toolbar form select#activity').find(':selected').attr('data-project')) {
$('.toolbar form select#activity').val('');
}
break;