X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=reports.php;h=efbf96421e09de550036744f212af67a1c090339;hb=7961e2909a8c8c456c1b0d6bee2944cabde592c0;hp=ae7f552cb8367dc8d75d9402d9988231ee69f63d;hpb=3be2bc61911ea52fb39774f7e569f7f9f2552b58;p=timetracker.git diff --git a/reports.php b/reports.php index ae7f552c..efbf9642 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,8 +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 ($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. @@ -298,7 +298,7 @@ if ($request->isPost()) { if (!ttValidString($bean->getAttribute('new_fav_report'))) $err->add($i18n->get('error.field'), $i18n->get('form.reports.save_as_favorite')); if ($err->no()) { - $id = ttFavReportHelper::saveReport($user->id, $bean); + $id = ttFavReportHelper::saveReport($user->id, $bean); // TODO: review "on behalf" situations (both user and group), redesign if needed. if (!$id) $err->add($i18n->get('error.db')); if ($err->no()) {