Fixed ttTimesheetHelper::getApprovers function.

[timetracker.git] / timesheet_add.php

diff --git a/timesheet_add.php b/timesheet_add.php
index c52fea6a8916723f7d8435d2688837c4557564c7..9e6b9acd073009e408fac5e997595f606bc00087 100644 (file)
--- a/timesheet_add.php
+++ b/timesheet_add.php
@@ -28,9 +28,10 @@
 
 require_once('initialize.php');
 import('form.Form');
 
 require_once('initialize.php');
 import('form.Form');

+import('ttTimesheetHelper');

 
 // Access checks.
 
 // Access checks.

-if (!(ttAccessAllowed('manage_own_timesheets') || ttAccessAllowed('manage_timesheets'))) {
+if (!(ttAccessAllowed('manage_own_timesheets') || ttAccessAllowed('manage_timesheets') || ttAccessAllowed('manage_all_timesheets'))) {

   header('Location: access_denied.php');
   exit();
 }
   header('Location: access_denied.php');
   exit();
 }


@@ -43,6 +44,10 @@ if (!$user->isPluginEnabled('ts')) {
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('timesheet_name'));
   $cl_comment = trim($request->getParameter('submitter_comment'));
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('timesheet_name'));
   $cl_comment = trim($request->getParameter('submitter_comment'));

+
+  // Report settings are stored in session bean before we get here.
+  $bean = new ActionForm('reportBean', new Form('reportForm'), $request);
+  $bean->loadBean();

 }
 
 $form = new Form('timesheetForm');
 }
 
 $form = new Form('timesheetForm');


@@ -56,25 +61,23 @@ if ($request->isPost()) {
   if (!ttValidString($cl_comment, true)) $err->add($i18n->get('error.field'), $i18n->get('label.comment'));
 
   if ($err->no()) {
   if (!ttValidString($cl_comment, true)) $err->add($i18n->get('error.field'), $i18n->get('label.comment'));
 
   if ($err->no()) {

-    /*
-    if (!ttProjectHelper::getProjectByName($cl_name)) {
-      if (ttProjectHelper::insert(array('name' => $cl_name,
-        'description' => $cl_description,
-        'users' => $cl_users,
-        'tasks' => $cl_tasks,
-        'status' => ACTIVE))) {
-          header('Location: projects.php');
+    $user_id = $bean->getDetachedAttribute('timesheet_user_id');
+    if (!ttTimesheetHelper::getTimesheetByName($cl_name, $user_id)) {
+      if (ttTimesheetHelper::insert(array('user_id' => $user_id,
+        'client_id' => $bean->getAttribute('client'),
+        'name' => $cl_name,
+        'comment' => $cl_comment))) {
+          header('Location: timesheets.php');

           exit();
         } else
           $err->add($i18n->get('error.db'));
     } else
       $err->add($i18n->get('error.object_exists'));
           exit();
         } else
           $err->add($i18n->get('error.db'));
     } else
       $err->add($i18n->get('error.object_exists'));

-    */

   }
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
   }
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));

-$smarty->assign('onload', 'onLoad="document.timesheetForm.timmesheet_name.focus()"');
+$smarty->assign('onload', 'onLoad="document.timesheetForm.timesheet_name.focus()"');

 $smarty->assign('title', $i18n->get('title.add_timesheet'));
 $smarty->assign('content_page_name', 'timesheet_add.tpl');
 $smarty->display('index.tpl');
 $smarty->assign('title', $i18n->get('title.add_timesheet'));
 $smarty->assign('content_page_name', 'timesheet_add.tpl');
 $smarty->display('index.tpl');