]> wagnertech.de Git - timetracker.git/commitdiff
A bit more refactoring for subgroups.
authorNik Okuntseff <support@anuko.com>
Sun, 9 Dec 2018 17:34:37 +0000 (17:34 +0000)
committerNik Okuntseff <support@anuko.com>
Sun, 9 Dec 2018 17:34:37 +0000 (17:34 +0000)
WEB-INF/lib/ttProjectHelper.class.php
WEB-INF/templates/footer.tpl
mobile/project_add.php
mobile/project_edit.php
project_add.php
project_edit.php

index 87d75c6236869b63a748c3f72f9fcce9a332350b..06dcd28667b3623a71b03164bc0f0ba8edfa0d91 100644 (file)
@@ -196,10 +196,11 @@ class ttProjectHelper {
   // insert function inserts a new project into database.
   static function insert($fields)
   {
+    global $user;
     $mdb2 = getConnection();
 
-    $group_id = (int) $fields['group_id'];
-    $org_id = (int) $fields['org_id'];
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
 
     $name = $fields['name'];
     $description = $fields['description'];
index 96e605845a0d41ca3c847e70ca75321ca7a9e224..1cb0da70931967333b9bfdce808912055371aab9 100644 (file)
@@ -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.4622 | 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.4623 | 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>
index aa3e40f73c5b5a7418f250d528749d88b41af6a0..98f7c064b86d1e06babe056b76d0b2fa9cc1d292 100644 (file)
@@ -77,10 +77,7 @@ if ($request->isPost()) {
 
   if ($err->no()) {
     if (!ttProjectHelper::getProjectByName($cl_name)) {
-      if (ttProjectHelper::insert(array(
-        'group_id' => $user->getGroup(),
-        'org_id' => $user->org_id,
-        'name' => $cl_name,
+      if (ttProjectHelper::insert(array('name' => $cl_name,
         'description' => $cl_description,
         'users' => $cl_users,
         'tasks' => $cl_tasks,
index afe999536d6804956a835fb0f9fe6a72990972f8..40728aaf72296d5425e325126d383926836b60e0 100644 (file)
@@ -118,10 +118,7 @@ if ($request->isPost()) {
 
     if ($request->getParameter('btn_copy')) {
       if (!ttProjectHelper::getProjectByName($cl_name)) {
-        if (ttProjectHelper::insert(array(
-          'group_id' => $user->getGroup(),
-          'org_id' => $user->org_id,
-          'name' => $cl_name,
+        if (ttProjectHelper::insert(array('name' => $cl_name,
           'description' => $cl_description,
           'users' => $cl_users,
           'tasks' => $cl_tasks,
index e8f988834754ed2be1e63787aec83b01e541cb73..e00a0316fdd6e99e051e3abba117db70566f2227 100644 (file)
@@ -77,10 +77,7 @@ if ($request->isPost()) {
 
   if ($err->no()) {
     if (!ttProjectHelper::getProjectByName($cl_name)) {
-      if (ttProjectHelper::insert(array(
-        'group_id' => $user->getGroup(),
-        'org_id' => $user->org_id,
-        'name' => $cl_name,
+      if (ttProjectHelper::insert(array('name' => $cl_name,
         'description' => $cl_description,
         'users' => $cl_users,
         'tasks' => $cl_tasks,
index 7f48c910ce3159e6196266bc67df3d921e9624bc..6fe082873f00765885675c67679ac5575784168c 100644 (file)
@@ -117,10 +117,7 @@ if ($request->isPost()) {
 
     if ($request->getParameter('btn_copy')) {
       if (!ttProjectHelper::getProjectByName($cl_name)) {
-        if (ttProjectHelper::insert(array(
-          'group_id' => $user->getGroup(),
-          'org_id' => $user->org_id,
-          'name' => $cl_name,
+        if (ttProjectHelper::insert(array('name' => $cl_name,
           'description' => $cl_description,
           'users' => $cl_users,
           'tasks' => $cl_tasks,