diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 78e0f1999d..a9926b6976 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -129,14 +129,14 @@ $lang->project->assignedToMe = 'To me'; $lang->project->statusSelects[''] = 'More'; $lang->project->statusSelects['finishedbyme'] = 'Finished by me'; -$lang->project->statusSelects['wait'] = 'Pending'; -$lang->project->statusSelects['undone'] = 'Undone'; -$lang->project->statusSelects['unclosed'] = 'Unclosed'; +$lang->project->statusSelects['wait'] = 'Wait'; $lang->project->statusSelects['doing'] = 'Doing'; +$lang->project->statusSelects['undone'] = 'Undone'; $lang->project->statusSelects['done'] = 'Done'; $lang->project->statusSelects['closed'] = 'Closed'; $lang->project->statusSelects['delayed'] = 'Delayed'; $lang->project->statusSelects['needconfirm'] = 'Story changed'; +$lang->project->statusSelects['cancel'] = 'Canceled'; $lang->project->groups[''] = 'Group View'; $lang->project->groups['story'] = 'Group by story'; $lang->project->groups['status'] = 'Group by status'; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index 0d010b0d75..57c1b21f28 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -130,13 +130,13 @@ $lang->project->assignedToMe = '指派给我'; $lang->project->statusSelects[''] = '更多'; $lang->project->statusSelects['finishedbyme'] = '我完成'; $lang->project->statusSelects['wait'] = '未开始'; -$lang->project->statusSelects['undone'] = '未完成'; -$lang->project->statusSelects['unclosed'] = '未关闭'; $lang->project->statusSelects['doing'] = '进行中'; +$lang->project->statusSelects['undone'] = '未完成'; $lang->project->statusSelects['done'] = '已完成'; $lang->project->statusSelects['closed'] = '已关闭'; $lang->project->statusSelects['delayed'] = '已延期'; $lang->project->statusSelects['needconfirm'] = '需求变动'; +$lang->project->statusSelects['cancel'] = '已取消'; $lang->project->groups[''] = '分组查看'; $lang->project->groups['story'] = '需求分组'; $lang->project->groups['status'] = '状态分组'; diff --git a/module/task/model.php b/module/task/model.php index 6145c2f2b6..ddfcda0486 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -695,12 +695,11 @@ class taskModel extends model ->where('t1.project')->eq((int)$projectID) ->andWhere('t1.deleted')->eq(0) ->beginIF($type == 'undone')->andWhere("t1.status = 'wait'")->orWhere("t1.status = 'doing'")->fi() - ->beginIF($type == 'unclosed')->andWhere("t1.status != 'closed'")->fi() ->beginIF($type == 'needconfirm')->andWhere('t2.version > t1.storyVersion')->andWhere("t2.status = 'active'")->fi() ->beginIF($type == 'assignedtome')->andWhere('t1.assignedTo')->eq($this->app->user->account)->fi() ->beginIF($type == 'finishedbyme')->andWhere('t1.finishedby')->eq($this->app->user->account)->fi() ->beginIF($type == 'delayed')->andWhere('deadline')->between('1970-1-1', helper::now())->andWhere('t1.status')->in('wait,doing')->fi() - ->beginIF(strpos(',all,undone,unclosed,needconfirm,assignedtome,delayed,finishedbyme,', ",$type,") === false)->andWhere('t1.status')->in($type)->fi() + ->beginIF(strpos(',all,undone,needconfirm,assignedtome,delayed,finishedbyme,', ",$type,") === false)->andWhere('t1.status')->in($type)->fi() ->orderBy($orderBy) ->page($pager) ->fetchAll();