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

2016-05-24 14:58:26 +08:00
parent bc3c227626 af847155bd
commit 74f4d67357
22 changed files with 54 additions and 24 deletions
@@ -1693,9 +1693,9 @@ class projectModel extends model
        {
            $link = helper::createLink($module, $method, "projectID=%s&type=$extra");
        }
-        elseif($module == 'project' && $method == 'index')
+        elseif($module == 'project' && ($method == 'index' or $method == 'all'))
        {
-            $link = helper::createLink($module, $method, "locate=no&status=undone&projectID=%s");
+            $link = helper::createLink($module, 'task', "projectID=%s");
        }
        else
        {