From b994732b3289f5981df09f457c26017bef87d47b Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Wed, 31 Mar 2021 09:21:51 +0800 Subject: [PATCH 1/6] * Fix bug. --- module/project/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/project/model.php b/module/project/model.php index e63327e9c9..acc92c8294 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -1239,7 +1239,7 @@ class projectModel extends model { $canOrder = common::hasPriv('project', 'updateOrder'); $canBatchEdit = common::hasPriv('project', 'batchEdit'); - $projectLink = $this->config->systemMode == 'new' ? helper::createLink('project', 'index', "projectID=$project->id", '', '', $project->id) : helper::createLink('project', 'task', "projectID=$project->id"); + $projectLink = $this->config->systemMode == 'new' ? helper::createLink('project', 'index', "projectID=$project->id", '', '', $project->id) : helper::createLink('execution', 'task', "projectID=$project->id"); $account = $this->app->user->account; $id = $col->id; From 68cef1c44d7659e7c344aa24c14c3c8e3a900388 Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Wed, 31 Mar 2021 09:48:35 +0800 Subject: [PATCH 2/6] * Fix bug #11689. --- module/project/control.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/project/control.php b/module/project/control.php index 01981eda84..e8a59deb8c 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -629,7 +629,7 @@ class project extends control $this->view->position[] = html::a($this->createLink('project', 'browse', "projectID=$projectID"), $project->name); $this->view->position[] = $this->lang->project->dynamic; - $this->view->userIdPairs = $this->project->getTeamMemberPairs($project->parent); + $this->view->userIdPairs = $this->project->getTeamMemberPairs($projectID); $this->view->accountPairs = $this->loadModel('user')->getPairs('noletter|nodeleted'); /* Assign. */ From b5eb595b0566b485da8cfed2f0f0e12c0037fe9f Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Wed, 31 Mar 2021 09:50:42 +0800 Subject: [PATCH 3/6] * Fix bug. --- module/cron/view/create.html.php | 3 --- module/cron/view/edit.html.php | 3 --- module/group/lang/resource.php | 2 +- module/project/control.php | 12 ++++----- module/project/lang/zh-cn.php | 2 +- module/project/model.php | 3 +-- module/project/view/browse.html.php | 4 +-- module/project/view/projecttitle.html.php | 32 ----------------------- 8 files changed, 11 insertions(+), 50 deletions(-) delete mode 100644 module/project/view/projecttitle.html.php diff --git a/module/cron/view/create.html.php b/module/cron/view/create.html.php index a60281356c..afed61d995 100644 --- a/module/cron/view/create.html.php +++ b/module/cron/view/create.html.php @@ -11,9 +11,6 @@ */ ?> -
diff --git a/module/cron/view/edit.html.php b/module/cron/view/edit.html.php index 5ca99a599e..24b6207096 100644 --- a/module/cron/view/edit.html.php +++ b/module/cron/view/edit.html.php @@ -11,9 +11,6 @@ */ ?> -
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 3400b3411d..9bf9bf8739 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -189,7 +189,7 @@ if($config->systemMode == 'new') $lang->resource->project = new stdclass(); $lang->resource->project->index = 'index'; $lang->resource->project->browse = 'browse'; - $lang->resource->project->projectTitle = 'moduleOpen'; + $lang->resource->project->programTitle = 'moduleOpen'; $lang->resource->project->create = 'create'; $lang->resource->project->edit = 'edit'; $lang->resource->project->batchEdit = 'batchEdit'; diff --git a/module/project/control.php b/module/project/control.php index e8a59deb8c..5a868b00ce 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -208,8 +208,8 @@ class project extends control $pager = new pager($recTotal, $recPerPage, $pageID); $queryID = ($browseType == 'bysearch') ? (int)$param : 0; - $projectTitle = $this->loadModel('setting')->getItem('owner=' . $this->app->user->account . '&module=project&key=projectTitle'); - $projectStats = $this->loadModel('program')->getProjectStats($programID, $browseType, $queryID, $orderBy, $pager, $projectTitle); + $programTitle = $this->loadModel('setting')->getItem('owner=' . $this->app->user->account . '&module=project&key=programTitle'); + $projectStats = $this->loadModel('program')->getProjectStats($programID, $browseType, $queryID, $orderBy, $pager, $programTitle); $this->view->title = $this->lang->project->browse; $this->view->position[] = $this->lang->project->browse; @@ -233,17 +233,17 @@ class project extends control * @access public * @return void */ - public function projectTitle() + public function programTitle() { $this->loadModel('setting'); if($_POST) { - $projectTitle = $this->post->projectTitle; - $this->setting->setItem($this->app->user->account . '.project.projectTitle', $projectTitle); + $programTitle = $this->post->programTitle; + $this->setting->setItem($this->app->user->account . '.project.programTitle', $programTitle); die(js::reload('parent.parent')); } - $status = $this->setting->getItem('owner=' . $this->app->user->account . '&module=project&key=projectTitle'); + $status = $this->setting->getItem('owner=' . $this->app->user->account . '&module=project&key=programTitle'); $this->view->status = empty($status) ? '0' : $status; $this->display(); } diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index f0d1f4eb83..8411af5e8e 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -86,7 +86,7 @@ $lang->project->leftStories = '剩余需求'; $lang->project->leftTasks = '剩余任务'; $lang->project->leftBugs = '剩余Bug'; $lang->project->children = '子项目'; -$lang->project->parent = '父项目集'; +$lang->project->parent = '所属项目集'; $lang->project->allStories = '总需求'; $lang->project->doneStories = '已完成'; $lang->project->doneProjects = '已结束'; diff --git a/module/project/model.php b/module/project/model.php index acc92c8294..ec5eeaa2e8 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -645,11 +645,10 @@ class projectModel extends model public function createManageLink($project) { $link = $project->type == 'program' ? helper::createLink('project', 'browse', "projectID={$project->id}&status=all") : helper::createLink('project', 'index', "projectID={$project->id}", '', '', $project->id); - $icon = $project->type == 'program' ? " " : " "; if($this->app->rawModule == 'execution') $link = helper::createLink('execution', 'all', "status=all&projectID={$project->id}"); - return html::a($link, $icon . $project->name, '_self', "id=program{$project->id} title='{$project->name}' class='text-ellipsis'"); + return html::a($link, $project->name, '_self', "id=program{$project->id} title='{$project->name}' class='text-ellipsis'"); } /** diff --git a/module/project/view/browse.html.php b/module/project/view/browse.html.php index 7ec51d1e50..73ccfbb441 100644 --- a/module/project/view/browse.html.php +++ b/module/project/view/browse.html.php @@ -24,7 +24,7 @@ js::set('browseType', $browseType); config->systemMode == 'new'):?>
- name : $lang->project->common;?> + name : $lang->project->parent;?> ", '', 'class="text-muted"');?>
@@ -55,7 +55,7 @@ js::set('browseType', $browseType);
- project->moduleSetting, '', "class='btn btn-info btn-wide iframe'", true, true);?> + project->moduleSetting, '', "class='btn btn-info btn-wide iframe'", true, true);?>
diff --git a/module/project/view/projecttitle.html.php b/module/project/view/projecttitle.html.php deleted file mode 100644 index 2bc8ae2eca..0000000000 --- a/module/project/view/projecttitle.html.php +++ /dev/null @@ -1,32 +0,0 @@ - - * @package project - * @version $Id: prjprojecttitle.html.php 4769 2013-05-05 07:24:21Z wwccss $ - * @link http://www.zentao.net - */ -?> - -
-

project->moduleSetting;?>

-
-
-
- - - - - - - - - - -
project->moduleOpen;?>project->programTitle, $status);?>
-
-
- From bf327f58d211c17bf26a17c78d8c8e403c0f52fb Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Wed, 31 Mar 2021 09:55:35 +0800 Subject: [PATCH 4/6] * Fix bug #11526. --- module/personnel/view/accessible.html.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/personnel/view/accessible.html.php b/module/personnel/view/accessible.html.php index 538e08c971..d06bcb048a 100644 --- a/module/personnel/view/accessible.html.php +++ b/module/personnel/view/accessible.html.php @@ -35,8 +35,8 @@ js::set('deptID', $deptID);
- -
+
+
From a321030c637927a055fdae91aff127d86a293cc8 Mon Sep 17 00:00:00 2001 From: hufangzhou <746775970@qq.com> Date: Wed, 31 Mar 2021 09:58:06 +0800 Subject: [PATCH 5/6] * Fix bug #11674. --- module/execution/model.php | 6 +++++- module/execution/view/ajaxgetdropmenu.html.php | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/module/execution/model.php b/module/execution/model.php index acbc4c350e..b946c1da8f 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -1150,10 +1150,14 @@ class executionModel extends model { $link = helper::createLink($module, $method, "executionID=%s&type=$extra"); } - elseif($module == 'execution' && ($method == 'index' or $method == 'all')) + elseif($module == 'execution' and ($method == 'index' or $method == 'all')) { $link = helper::createLink($module, 'task', "executionID=%s"); } + elseif($module == 'bug' and $method == 'create' and $this->app->openApp == 'execution') + { + $link = helper::createLink($module, $method, "productID=0&branch=0&extra=executionID=%s"); + } else { $link = helper::createLink($module, $method, "executionID=%s"); diff --git a/module/execution/view/ajaxgetdropmenu.html.php b/module/execution/view/ajaxgetdropmenu.html.php index 4765518eff..5aff5361a4 100644 --- a/module/execution/view/ajaxgetdropmenu.html.php +++ b/module/execution/view/ajaxgetdropmenu.html.php @@ -24,13 +24,13 @@ foreach($executions as $execution) $executionName = $config->systemMode == 'new' ? zget($projects, $execution->project) . '/' . $execution->name : $execution->name; if($execution->status != 'done' and $execution->status != 'closed' and ($execution->PM == $this->app->user->account or isset($execution->teams[$this->app->user->account]))) { - $myProjectsHtml .= html::a(sprintf($link, $execution->id), " " . $executionName, '', "class='text-important $selected' title='{$executionName}' data-key='" . zget($executionsPinYin, $execution->name, '') . "'"); + $myProjectsHtml .= html::a(sprintf($link, $execution->id), " " . $executionName, '', "class='text-important $selected' title='{$executionName}' data-key='" . zget($executionsPinYin, $execution->name, '') . "' data-app='{$this->app->openApp}'"); } else if($execution->status != 'done' and $execution->status != 'closed' and $execution->PM != $this->app->user->account and !isset($execution->teams[$this->app->user->account])) { - $normalProjectsHtml .= html::a(sprintf($link, $execution->id), " " . $executionName, '', "class='$selected' title='{$executionName}' data-key='" . zget($executionsPinYin, $execution->name, '') . "'"); + $normalProjectsHtml .= html::a(sprintf($link, $execution->id), " " . $executionName, '', "class='$selected' title='{$executionName}' data-key='" . zget($executionsPinYin, $execution->name, '') . "' data-app='{$this->app->openApp}'"); } - else if($execution->status == 'done' or $execution->status == 'closed') $closedProjectsHtml .= html::a(sprintf($link, $execution->id), " " . $executionName, '', "class='$selected' title='{$executionName}' data-key='" . zget($executionsPinYin, $execution->name, '') . "'"); + else if($execution->status == 'done' or $execution->status == 'closed') $closedProjectsHtml .= html::a(sprintf($link, $execution->id), " " . $executionName, '', "class='$selected' title='{$executionName}' data-key='" . zget($executionsPinYin, $execution->name, '') . "' data-app='{$this->app->openApp}'"); } ?>
From b77bce3a5661a126e49892c2a9702e1676b71c93 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Wed, 31 Mar 2021 10:10:23 +0800 Subject: [PATCH 6/6] * Fix lang. --- module/common/lang/zh-cn.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index aa0fc9cc2c..daa046908c 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -109,7 +109,7 @@ $lang->select = '选择'; $lang->selectAll = '全选'; $lang->selectReverse = '反选'; $lang->loading = '稍候...'; -$lang->notFound = '抱歉，您访问的对象并不存在！'; +$lang->notFound = '抱歉，您访问的对象不存在！'; $lang->notPage = '抱歉，您访问的功能正在开发中！'; $lang->showAll = '[[全部显示]]'; $lang->selectedItems = '已选择 {0} 项';