Releasing Approval plugin for testing.

[timetracker.git] / reports.php

diff --git a/reports.php b/reports.php
index 107f8cee6cf8cf1c5d5b8f93619b05027c2299fb..febfad794bef66b06f03b5c1790dc9d53a845164 100644 (file)
--- a/reports.php
+++ b/reports.php
@@ -178,6 +178,19 @@ if ($showPaidStatus) {
  ));
 }
 
+// Add approved / not approved selector.
+$showApproved = $user->isPluginEnabled('ap') &&
+  ($user->can('view_own_reports') || $user->can('view_reports') ||
+   $user->can('view_all_reports') || ($user->can('view_client_reports') && $user->can('view_client_unapproved')));
+if ($showApproved) {
+  $form->addInput(array('type'=>'combobox',
+   'name'=>'approved',
+   'style'=>'width: 250px;',
+   'data'=>array('1'=>$i18n->get('dropdown.approved'),'2'=>$i18n->get('dropdown.not_approved')),
+   'empty'=>array(''=>$i18n->get('dropdown.all'))
+  ));
+}
+
 // Add timesheet assignment selector.
 $showTimesheetDropdown = $user->isPluginEnabled('ts') &&
   ($user->can('view_own_timesheets') || $user->can('view_timesheets') ||
@@ -198,19 +211,6 @@ $showTimesheetCheckbox = $user->isPluginEnabled('ts') &&
   ($user->can('view_own_timesheets') || $user->can('view_timesheets') ||
    $user->can('view_all_timesheets') || $user->can('view_client_timesheets'));
 
-// Add approved / not approved selector.
-$showApproved = $user->isPluginEnabled('ap') &&
-  ($user->can('view_own_reports') || $user->can('view_reports') ||
-   $user->can('view_all_reports') || ($user->can('view_client_reports') && $user->can('view_client_unapproved')));
-if ($showApproved) {
-  $form->addInput(array('type'=>'combobox',
-   'name'=>'approved',
-   'style'=>'width: 250px;',
-   'data'=>array('1'=>$i18n->get('dropdown.approved'),'2'=>$i18n->get('dropdown.not_approved')),
-   'empty'=>array(''=>$i18n->get('dropdown.all'))
-  ));
-}
-
 // Add user table.
 $showUsers = $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient();
 $user_list = array();