Some more refactoring for subgroups.

[timetracker.git] / client_edit.php

diff --git a/client_edit.php b/client_edit.php
index 05203237f9a5bb0bcc794fc25aa008bd3f97dc96..0dc3bb65595bf3a7db776b2896a73a4d2d1721b4 100644 (file)
--- a/client_edit.php
+++ b/client_edit.php
@@ -30,16 +30,21 @@ require_once('initialize.php');
 import('form.Form');
 import('ttClientHelper');
 import('ttTeamHelper');
 import('form.Form');
 import('ttClientHelper');
 import('ttTeamHelper');

+import('ttGroupHelper');

 
 

-// Access check.
-if (!ttAccessAllowed('manage_clients') || !$user->isPluginEnabled('cl')) {
+// Access checks.
+if (!ttAccessAllowed('manage_clients')) {

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

+if (!$user->isPluginEnabled('cl')) {
+  header('Location: feature_disabled.php');
+  exit();
+}

 
 $cl_id = (int) $request->getParameter('id');
 
 
 $cl_id = (int) $request->getParameter('id');
 

-$projects = ttTeamHelper::getActiveProjects($user->team_id);
+$projects = ttGroupHelper::getActiveProjects();

 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));
 
 if ($request->isPost()) {
   $cl_name = trim($request->getParameter('name'));


@@ -66,7 +71,7 @@ $form->addInput(array('type'=>'textarea','name'=>'address','maxlength'=>'255','s
 $form->addInput(array('type'=>'floatfield','name'=>'tax','size'=>'10','format'=>'.2','value'=>$cl_tax));
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
   'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));
 $form->addInput(array('type'=>'floatfield','name'=>'tax','size'=>'10','format'=>'.2','value'=>$cl_tax));
 $form->addInput(array('type'=>'combobox','name'=>'status','value'=>$cl_status,
   'data'=>array(ACTIVE=>$i18n->get('dropdown.status_active'),INACTIVE=>$i18n->get('dropdown.status_inactive'))));

-if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
+if (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode())

   $form->addInput(array('type'=>'checkboxgroup','name'=>'projects','data'=>$projects,'datakeys'=>array('id','name'),'layout'=>'H','value'=>$cl_projects));
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 $form->addInput(array('type'=>'submit','name'=>'btn_copy','value'=>$i18n->get('button.copy')));
   $form->addInput(array('type'=>'checkboxgroup','name'=>'projects','data'=>$projects,'datakeys'=>array('id','name'),'layout'=>'H','value'=>$cl_projects));
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 $form->addInput(array('type'=>'submit','name'=>'btn_copy','value'=>$i18n->get('button.copy')));


@@ -93,13 +98,14 @@ if ($request->isPost()) {
         } else
           $err->add($i18n->get('error.db'));
       } else
         } else
           $err->add($i18n->get('error.db'));
       } else

-        $err->add($i18n->get('error.client_exists'));
+        $err->add($i18n->get('error.object_exists'));

     }
 
     if ($request->getParameter('btn_copy')) {
       if (!ttClientHelper::getClientByName($cl_name)) {
         if (ttClientHelper::insert(array(
     }
 
     if ($request->getParameter('btn_copy')) {
       if (!ttClientHelper::getClientByName($cl_name)) {
         if (ttClientHelper::insert(array(

-          'team_id' => $user->team_id,
+          'group_id' => $user->getGroup(),
+          'org_id' => $user->org_id,

           'name' => $cl_name,
           'address' => $cl_address,
           'tax' => $cl_tax,
           'name' => $cl_name,
           'address' => $cl_address,
           'tax' => $cl_tax,


@@ -110,7 +116,7 @@ if ($request->isPost()) {
         } else
           $err->add($i18n->get('error.db'));
       } else
         } else
           $err->add($i18n->get('error.db'));
       } else

-        $err->add($i18n->get('error.client_exists'));
+        $err->add($i18n->get('error.object_exists'));

     }
   }
 } // isPost
     }
   }
 } // isPost