Merge branch 'master' of https://github.com/easysoft/zentaopms

module/project/view/tree.html.php

@@ -47,7 +47,7 @@
       </ul>
     </div>
     <?php
-    $misc = "class='btn btn-link iframe" . (common::hasPriv('task', 'export', $project) ? '' : ' dissabled') . "' data-width='700'";
+    $misc = "class='btn btn-link iframe" . (common::hasPriv('task', 'export', $project) ? '' : ' disabled') . "' data-width='700'";
     $link = common::hasPriv('task', 'export') ? $this->createLink('task', 'export', "project=$projectID&orderBy=$orderBy&type=tree") : '#';
     echo html::a($link, "<i class='icon icon-export muted'></i> <span class='text'>{$lang->export}</span>", '', $misc);
 

module/task/model.php

@@ -1169,7 +1169,6 @@ class taskModel extends model
             ->setDefault('status', 'done')
             ->setDefault('finishedBy, lastEditedBy', $this->app->user->account)
             ->setDefault('finishedDate, lastEditedDate', $now)
-            ->setDefault('finishedDate, lastEditedDate', $now)
             ->removeIF(!empty($oldTask->team), 'finishedBy,finishedDate,status,left')
             ->remove('comment,files,labels')
             ->get();

module/todo/control.php

@@ -389,7 +389,9 @@ class todo extends control
                 $this->send($response);
             }
             if(isonlybody())die(js::reload('parent.parent'));
-            die(js::locate($this->createLink('my', 'todo', "type=$date"), 'parent'));
+
+            $browseLink = $this->session->todoList ? $this->session->todoList : $this->createLink('my', 'todo');
+            die(js::locate($browseLink, 'parent'));
         }
     }
 

module/tree/model.php

@@ -1672,7 +1672,7 @@ class treeModel extends model
                         {
                             if($firstChildren->id == $children->parent) $firstChildren->children[] = $children;
                         }
-                    };//Filter project children modules.
+                    }
                     $tree[$root][] = $children;
                 }
             }