// Use custom fields plugin if it is enabled.
if ($user->isPluginEnabled('cf')) {
require_once('plugins/CustomFields.class.php');
- $custom_fields = new CustomFields($user->group_id);
+ $custom_fields = new CustomFields();
$smarty->assign('custom_fields', $custom_fields);
}
$form = new Form('reportForm');
// Get saved favorite reports for user.
-$report_list = ttFavReportHelper::getReports($user->id);
+$report_list = ttFavReportHelper::getReports();
$form->addInput(array('type'=>'combobox',
'name'=>'favorite_report',
- 'onchange'=>'document.reportForm.fav_report_changed.value=1;document.reportForm.submit();',
+ 'onchange'=>'this.form.fav_report_changed.value=1;this.form.submit();',
'style'=>'width: 250px;',
'data'=>$report_list,
'datakeys'=>array('id','name'),
// 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
$group_by_options['cf_1'] = $custom_fields->fields[0]['label'];
}
$group_by_options_size = sizeof($group_by_options);
-$form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by','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));
-}
+$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','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.
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()) {
if ($start_date->compare($end_date) > 0)
$err->add($i18n->get('error.interval'), $i18n->get('label.end_date'), $i18n->get('label.start_date'));
}
+ $group_by1 = $bean->getAttribute('group_by1');
+ $group_by2 = $bean->getAttribute('group_by2');
+ $group_by3 = $bean->getAttribute('group_by3');
+ if (($group_by3 != null && $group_by3 != 'no_grouping') && ($group_by3 == $group_by1 || $group_by3 == $group_by2))
+ $err->add($i18n->get('error.field'), $i18n->get('form.reports.group_by'));
+ if (($group_by2 != null && $group_by2 != 'no_grouping') && ($group_by2 == $group_by1 || $group_by3 == $group_by2))
+ $err->add($i18n->get('error.field'), $i18n->get('form.reports.group_by'));
// Check remaining values.
if (!ttReportHelper::verifyBean($bean)) $err->add($i18n->get('error.sys'));