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

Merge branch 'sprint/185_fixbug_wangyidong' into 'sprint/185'

Browse Source 
Sprint/185 fixbug wangyidong

See merge request easycorp/zentaopms!1878
This commit is contained in:
孙广明
2022-02-22 07:53:22 +00:00
parent 1a7ae952d5 23a5acab55
commit 47c48e68a2
5 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
extension/lite/action/ext/lang/zh-cn/lite.php
View File

@@ -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, 由 <strong>$actor</strong> 创建子目录 <strong>$extra</strong>。' . "\n";
$lang->action->desc->linkchildstory = '$date, 由 <strong>$actor</strong> 关联子目录 <strong>$extra</strong>。' . "\n";
$lang->action->desc->unlinkchildrenstory = '$date, 由 <strong>$actor</strong> 移除子目录 <strong>$extra</strong>。' . "\n";
$lang->action->desc->linkparentstory = '$date, 由 <strong>$actor</strong> 关联到父目录 <strong>$extra</strong>。' . "\n";
$lang->action->desc->unlinkparentstory = '$date, 由 <strong>$actor</strong> 从父目录<strong>$extra</strong>取消关联。' . "\n";
$lang->action->desc->deletechildrenstory = '$date, 由 <strong>$actor</strong> 删除子目录<strong>$extra</strong>。' . "\n";

2
extension/lite/common/ext/lang/zh-cn/lite.php
View File

@@ -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');

5
extension/lite/user/ext/view/featurebar.lite.html.hook.php
View File

@@ -1,3 +1,6 @@
<script>
$('#mainMenu .btn-toolbar > a[href*="bug"], a[href*="testtask"], a[href*="testcase"], a[href*="issue"], a[href*="risk"], a[href*="storyType=requirement"]').remove();
$('#mainMenu .btn-toolbar > a[href*="bug"], a[href*="testtask"], a[href*="testcase"], a[href*="issue"], a[href*="risk"], a[href*="requirement"]').remove();
<?php if($this->config->edition != 'open'):?>
$('#mainMenu .btn-toolbar > a:first').attr('href', createLink('user', 'todocalendar', 'userID=<?php echo $user->id?>'));
<?php endif;?>
</script>

2
module/project/model.php
View File

@@ -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');

3
module/story/model.php
View File

@@ -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=&param=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