X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=reports.php;h=6a0687e60d62c452e9b090804125a2844b76fbe8;hb=a711e76851f29c7e0ac290a279eb4dd984ea7167;hp=cba099160961f46646174c982fa49033fec76874;hpb=e99d8df6059bacd85be829c9a369f6a1e2994882;p=timetracker.git diff --git a/reports.php b/reports.php index cba09916..6a0687e6 100644 --- a/reports.php +++ b/reports.php @@ -149,7 +149,7 @@ if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isCli // Prepare user and assigned projects arrays. if ($user->can('view_reports') || $user->can('view_all_reports')) { $max_rank = $user->rank-1; - if ($user->can('view_all_reports')) $max_rank = 512; + if ($user->can('view_all_reports')) $max_rank = MAX_RANK; if ($user->can('view_own_reports')) $options = array('max_rank'=>$max_rank,'include_self'=>true); else @@ -234,10 +234,8 @@ if ($custom_fields && $custom_fields->fields[0] && $custom_fields->fields[0]['ty } $group_by_options_size = sizeof($group_by_options); $form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by1','data'=>$group_by_options)); -if (defined('MULTIPLE_GROUP_BY_DEBUG') && isTrue(MULTIPLE_GROUP_BY_DEBUG)) { - if ($group_by_options_size > 2) $form->addInput(array('type'=>'combobox','name'=>'group_by2','data'=>$group_by_options)); - if ($group_by_options_size > 3) $form->addInput(array('type'=>'combobox','name'=>'group_by3','data'=>$group_by_options)); -} +if ($group_by_options_size > 2) $form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by2','data'=>$group_by_options)); +if ($group_by_options_size > 3) $form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by3','data'=>$group_by_options)); $form->addInput(array('type'=>'checkbox','name'=>'chtotalsonly')); // Add text field for a new favorite report name.