Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

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

Browse Source
This commit is contained in:
chenfeiCF
2019-01-28 16:34:52 +08:00
parent c760545647 6924b5359d
commit d0f2e14326
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/backup/model.php
+1 -1
View File
@@ -284,7 +284,7 @@ class backupModel extends model
public function getBackupPath()
{
$backupPath = empty($this->config->backup->settingDir) ? $this->app->getTmpRoot() . 'backup' . DS : $this->config->backup->settingDir;
return trim(str_replace('\\', '/', $backupPath), '/') . '/';
return rtrim(str_replace('\\', '/', $backupPath), '/') . '/';
}
/**
module/tree/model.php
+3 -2
View File
@@ -508,7 +508,8 @@ class treeModel extends model
$fullTrees = array();
foreach($products as $id => $product)
{
$productInfo = $this->product->getById($id);
$linkedStory = $this->dao->select('*')->from(TABLE_PROJECTSTORY)->where('project')->eq($rootID)->andWhere('product')->eq($id)->fetch();
$productInfo = $this->product->getById($id);
/* tree menu. */
$productTree = array();
$branchTrees = array();
@@ -520,7 +521,7 @@ class treeModel extends model
->orderBy('grade desc, type, `order`')
->get();
$stmt = $this->dbh->query($query);
if($branch == 0) $productTree = $this->getDataStructure($stmt, 'task', $projectModules);
if($branch == 0 and $linkedStory) $productTree = $this->getDataStructure($stmt, 'task', $projectModules);
if($branch != 0)
{
$children = $this->getDataStructure($stmt, 'task', $projectModules);