A bit more refactoring.

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 5bb1100..09e0d89 100644 (file)
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
-          <td align="center">&nbsp;Anuko Time Tracker 1.18.29.4578 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.18.29.4579 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>

diff --git a/WEB-INF/templates/mobile/client_edit.tpl b/WEB-INF/templates/mobile/client_edit.tpl
index d01731f..4f70ced 100644 (file)
--- a/WEB-INF/templates/mobile/client_edit.tpl
+++ b/WEB-INF/templates/mobile/client_edit.tpl
@@ -24,7 +24,7 @@
           <td>{$i18n.label.required_fields}</td>
         </tr>
         <tr><td>&nbsp;</td></tr>
-{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+{if $show_projects}
         <tr>
           <td align="right">{$i18n.label.projects}:</td>
           <td>{$forms.clientForm.projects.control}</td>

diff --git a/client_edit.php b/client_edit.php
index 2b26d86..a1f9824 100644 (file)
--- a/client_edit.php
+++ b/client_edit.php
@@ -105,10 +105,7 @@ if ($request->isPost()) {
 
     if ($request->getParameter('btn_copy')) {
       if (!ttClientHelper::getClientByName($cl_name)) {
-        if (ttClientHelper::insert(array(
-          'group_id' => $user->getGroup(),
-          'org_id' => $user->org_id,
-          'name' => $cl_name,
+        if (ttClientHelper::insert(array('name' => $cl_name,
           'address' => $cl_address,
           'tax' => $cl_tax,
           'status' => $cl_status,

diff --git a/mobile/client_edit.php b/mobile/client_edit.php
index 4044637..b65ac99 100644 (file)
--- a/mobile/client_edit.php
+++ b/mobile/client_edit.php
@@ -63,6 +63,8 @@ if ($request->isPost()) {
   }
 }
 
+$show_projects = (MODE_PROJECTS == $user->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()) && count($projects) > 0;
+
 $form = new Form('clientForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$cl_id));
 $form->addInput(array('type'=>'text','name'=>'name','maxlength'=>'100','value'=>$cl_name));
@@ -70,7 +72,7 @@ $form->addInput(array('type'=>'textarea','name'=>'address','maxlength'=>'255','c
 $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->getTrackingMode() || MODE_PROJECTS_AND_TASKS == $user->getTrackingMode())
+if ($show_projects)
   $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')));
@@ -86,8 +88,7 @@ if ($request->isPost()) {
     if ($request->getParameter('btn_save')) {
       $client = ttClientHelper::getClientByName($cl_name);
       if (($client && ($cl_id == $client['id'])) || !$client) {
-        if (ttClientHelper::update(array(
-          'id' => $cl_id,
+        if (ttClientHelper::update(array('id' => $cl_id,
           'name' => $cl_name,
           'address' => $cl_address,
           'tax' => $cl_tax,
@@ -103,10 +104,7 @@ if ($request->isPost()) {
 
     if ($request->getParameter('btn_copy')) {
       if (!ttClientHelper::getClientByName($cl_name)) {
-        if (ttClientHelper::insert(array(
-          'group_id' => $user->getGroup(),
-          'org_id' => $user->org_id,
-          'name' => $cl_name,
+        if (ttClientHelper::insert(array('name' => $cl_name,
           'address' => $cl_address,
           'tax' => $cl_tax,
           'status' => $cl_status,
@@ -127,6 +125,7 @@ if ($request->isPost()) {
 } // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('show_projects', $show_projects);
 $smarty->assign('title', $i18n->get('title.edit_client'));
 $smarty->assign('content_page_name', 'mobile/client_edit.tpl');
 $smarty->display('mobile/index.tpl');