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

This commit is contained in:
wyd621
2013-09-12 15:56:52 +08:00
2 changed files with 4 additions and 3 deletions
+1 -1
View File
@@ -7,7 +7,7 @@ $config->action->objectNameFields['project'] = 'name';
$config->action->objectNameFields['task'] = 'name';
$config->action->objectNameFields['build'] = 'name';
$config->action->objectNameFields['bug'] = 'title';
$config->action->objectNameFields['case'] = 'title';
$config->action->objectNameFields['testcase'] = 'title';
$config->action->objectNameFields['testtask'] = 'name';
$config->action->objectNameFields['user'] = 'account';
$config->action->objectNameFields['doc'] = 'title';
+3 -2
View File
@@ -364,8 +364,9 @@ class treeModel extends model
$treeMenu[$module->parent] .= "</li>\n";
}
$lastMenu = "<ul class='tree'>" . @$treeMenu[0] . "</ul>\n";
$menu .= $lastMenu . '</li>';
$tree = isset($treeMenu[0]) ? $treeMenu[0] : '';
$lastMenu = "<ul class='tree'>" . $tree . "</ul>\n";
$menu .= $lastMenu . '</li>';
}
return $menu;
}