diff --git a/extension/lite/action/ext/lang/zh-cn/lite.php b/extension/lite/action/ext/lang/zh-cn/lite.php index 8bb9e00e85..2e4e66aae7 100644 --- a/extension/lite/action/ext/lang/zh-cn/lite.php +++ b/extension/lite/action/ext/lang/zh-cn/lite.php @@ -36,3 +36,17 @@ $lang->action->dynamicAction->task['unlinkparenttask'] = '从父任务取消 $lang->action->dynamicAction->task['deletechildrentask'] = '删除子任务'; $lang->action->dynamicAction->task['linkparenttask'] = '关联到父任务'; $lang->action->dynamicAction->task['linkchildtask'] = '关联子任务'; + +$lang->action->label->createchildrenstory = "创建子目录"; +$lang->action->label->linkchildstory = "关联子目录"; +$lang->action->label->unlinkchildrenstory = "取消关联子目录"; +$lang->action->label->linkparentstory = "关联到父目录"; +$lang->action->label->unlinkparentstory = "从父目录取消关联"; +$lang->action->label->deletechildrenstory = "删除子目录"; + +$lang->action->desc->createchildrenstory = '$date, 由 $actor 创建子目录 $extra。' . "\n"; +$lang->action->desc->linkchildstory = '$date, 由 $actor 关联子目录 $extra。' . "\n"; +$lang->action->desc->unlinkchildrenstory = '$date, 由 $actor 移除子目录 $extra。' . "\n"; +$lang->action->desc->linkparentstory = '$date, 由 $actor 关联到父目录 $extra。' . "\n"; +$lang->action->desc->unlinkparentstory = '$date, 由 $actor 从父目录$extra取消关联。' . "\n"; +$lang->action->desc->deletechildrenstory = '$date, 由 $actor 删除子目录$extra。' . "\n"; diff --git a/extension/lite/common/ext/lang/zh-cn/lite.php b/extension/lite/common/ext/lang/zh-cn/lite.php index 7d93f851f3..029f37b3c1 100644 --- a/extension/lite/common/ext/lang/zh-cn/lite.php +++ b/extension/lite/common/ext/lang/zh-cn/lite.php @@ -76,7 +76,7 @@ $lang->project->target = '目标'; $lang->kanban->menu = new stdclass(); $lang->kanban->menu->index = array('link' => "{$lang->dashboard}|project|index|project=%s"); $lang->kanban->menu->execution = array('link' => "$lang->executionKanban|project|execution|status=all&projectID=%s", 'subModule' => 'execution,task'); -$lang->kanban->menu->story = array('link' => "{$lang->project->target}|projectstory|story|projectID=%s", 'subModule' => 'projectstory,tree', 'alias' => 'story,track'); +$lang->kanban->menu->story = array('link' => "{$lang->project->target}|projectstory|story|projectID=%s", 'subModule' => 'projectstory,tree,story', 'alias' => 'story,track'); $lang->kanban->menu->doc = array('link' => "{$lang->doc->common}|doc|tableContents|type=project&objectID=%s", 'subModule' => 'doc'); $lang->kanban->menu->dynamic = array('link' => "$lang->dynamic|project|dynamic|project=%s"); $lang->kanban->menu->settings = array('link' => "$lang->settings|project|view|project=%s", 'subModule' => 'stakeholder', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist,team'); diff --git a/extension/lite/user/ext/view/featurebar.lite.html.hook.php b/extension/lite/user/ext/view/featurebar.lite.html.hook.php index c6d8a485e2..bf6b7bc5e2 100644 --- a/extension/lite/user/ext/view/featurebar.lite.html.hook.php +++ b/extension/lite/user/ext/view/featurebar.lite.html.hook.php @@ -1,3 +1,6 @@ diff --git a/module/project/model.php b/module/project/model.php index 3a24e89449..5be1157e6a 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -1941,7 +1941,7 @@ class projectModel extends model ->beginIF($status != 'all' and $status != 'undone')->andWhere('t2.status')->eq($status)->fi() ->beginIF(!$this->app->user->admin)->andWhere('t2.id')->in($this->app->user->view->sprints)->fi() ->andWhere('t2.deleted')->eq('0') - ->andWhere('t1.vision')->eq($this->config->vision) + ->andWhere('t2.vision')->eq($this->config->vision) ->orderBy($orderBy) ->page($pager) ->fetchAll('id'); diff --git a/module/story/model.php b/module/story/model.php index 3cbdb10482..b60f59d06b 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -477,6 +477,7 @@ class storyModel extends model $story->sourceNote = $stories->sourceNote[$i]; $story->product = $productID; $story->openedBy = $this->app->user->account; + $story->vision = $this->config->vision; $story->openedDate = $now; $story->version = 1; @@ -3984,7 +3985,7 @@ class storyModel extends model common::printIcon('story', 'close', $vars, $story, 'list', '', '', 'iframe', true); common::printIcon('story', 'edit', $vars . "&from=$story->from", $story, 'list', '', '', '', false, "data-group=$story->from"); if($story->type != 'requirement' and $this->config->vision != 'lite') common::printIcon('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=¶m=0&$vars", $story, 'list', 'sitemap', '', '', false, "data-app='qa'"); - if($this->app->rawModule != 'projectstory' OR $this->config->vision == 'lite') common::printIcon('story', 'batchCreate', "productID=$story->product&branch=$story->branch&module=$story->module&storyID=$story->id", $story, 'list', 'split', '', '', '', '', $this->lang->story->subdivide); + if($this->app->rawModule != 'projectstory' OR $this->config->vision == 'lite') common::printIcon('story', 'batchCreate', "productID=$story->product&branch=$story->branch&module=$story->module&storyID=$story->id&executionID={$this->session->project}", $story, 'list', 'split', '', '', '', '', $this->lang->story->subdivide); if($this->app->rawModule == 'projectstory' and $this->config->vision != 'lite') common::printIcon('projectstory', 'unlinkStory', "projectID={$this->session->project}&storyID=$story->id", '', 'list', 'unlink', 'hiddenwin'); } else