diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index 0abc9bbd29..fb5870aed2 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -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; diff --git a/module/story/model.php b/module/story/model.php index bbc713e19e..9066737227 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -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) {