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

* fix bug #760.

Browse Source
This commit is contained in:
chenfeiCF
2015-11-02 08:04:17 +08:00
parent 7c7117d233
commit 5b5f982fd6
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/project/lang/zh-cn.php
View File

@@ -14,7 +14,7 @@ $lang->project->common = $lang->projectCommon . '视图';
$lang->project->id = $lang->projectCommon . '编号';
$lang->project->company = '所属公司';
$lang->project->fromproject = '所属' . $lang->projectCommon;
$lang->project->allProjects = '所有' . $lang->projectCommon;
$lang->project->allProjects = '全部';
$lang->project->iscat = '作为目录';
$lang->project->type = $lang->projectCommon . '类型';
$lang->project->parent = '上级' . $lang->projectCommon;

2
module/story/model.php
View File

@@ -1194,7 +1194,7 @@ class storyModel extends model
unset($branches[0]);
$branches = join(',', $branches);
if($branches) $storyQuery .= " AND `branch`" . helper::dbIN("0,$branches");
$storyQuery .= " AND `status` != 'draft'";
$storyQuery .= " AND `status` NOT IN ('draft', 'closed')";
}
elseif($branch)
{