From aaace4b2dedf0953e5908a1085996e06aef8cf8b Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Thu, 11 Mar 2021 15:32:59 +0800 Subject: [PATCH] * Modify PRJMine to involved. --- config/filter.php | 9 ++++----- module/common/lang/zh-cn.php | 2 +- module/execution/model.php | 2 +- module/product/control.php | 6 +++--- module/product/js/project.js | 6 +++--- module/product/model.php | 12 ++++++------ module/product/view/project.html.php | 2 +- module/program/control.php | 4 ++-- module/program/model.php | 12 ++++++------ module/program/view/project.html.php | 8 ++++---- module/project/js/browse.js | 6 +++--- module/project/view/browse.html.php | 2 +- 12 files changed, 35 insertions(+), 36 deletions(-) diff --git a/config/filter.php b/config/filter.php index 9385ab5e2b..12a4b2b042 100644 --- a/config/filter.php +++ b/config/filter.php @@ -159,21 +159,20 @@ $filter->product->default->cookie['lastProduct'] = 'int'; $filter->product->default->cookie['preProductID'] = 'int'; $filter->product->index->cookie['preBranch'] = 'int'; $filter->product->export->cookie['checkedItem'] = 'reg::checked'; -$filter->product->project->cookie['PRJMine'] = 'code'; +$filter->product->project->cookie['involved'] = 'code'; $filter->program->default->cookie['lastPGM'] = 'int'; $filter->program->default->cookie['lastPRJ'] = 'int'; $filter->program->prjbrowse->cookie['programType'] = 'code'; -$filter->program->prjbrowse->cookie['PRJMine'] = 'code'; -$filter->program->pgmproject->cookie['PRJMine'] = 'code'; -$filter->program->prjbrowse->cookie['mine'] = 'code'; -$filter->program->pgmbrowse->cookie['showClosed'] = 'code'; +$filter->program->project->cookie['involved'] = 'code'; +$filter->program->browse->cookie['showClosed'] = 'code'; $filter->program->export->cookie['checkedItem'] = 'reg::checked'; $filter->program->ajaxgetpgmdropmenu->cookie['showClosed'] = 'code'; $filter->project->default->cookie['lastProject'] = 'int'; $filter->project->default->cookie['lastPRJ'] = 'int'; $filter->project->default->cookie['projectMode'] = 'code'; +$filter->project->browse->cookie['involved'] = 'code'; $filter->project->story->cookie['storyModuleParam'] = 'int'; $filter->project->story->cookie['storyPreProjectID'] = 'int'; $filter->project->story->cookie['storyProductParam'] = 'int'; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index f11e9042bb..b619d5dace 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -349,7 +349,7 @@ $lang->execution->viewMenu->qa = array('link' => '测试|qa|index|'); $lang->execution->viewMenu->ci = array('link' => '代码|repo|browse|'); $lang->execution->viewMenu->doc = array('link' => '文档|doc|objectLibs|type=execution&objectID=%s&from=execution', 'subModule' => 'doc'); $lang->execution->viewMenu->build = array('link' => '版本|execution|build|executionID=%s', 'subModule' => 'build'); -$lang->execution->viewMenu->release = array('link' => '发布|projectrelease|browse|project={PROJECT}'); +$lang->execution->viewMenu->release = array('link' => '发布|projectrelease|browse|project=%s'); $lang->execution->viewMenu->action = array('link' => '动态|execution|dynamic|executionID=%s'); $lang->execution->viewMenu->setting = array('link' => '设置|execution|view|executionID=%s', 'subModule' => 'personnel', 'alias' => 'edit', 'class' => 'dropdown dropdown-hover'); diff --git a/module/execution/model.php b/module/execution/model.php index afe46ce8d1..3f1b45ad2d 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -412,7 +412,7 @@ class executionModel extends model $member = new stdclass(); $member->root = $executionID; $member->account = $this->app->user->account; - $member->role = $this->lang->user->roleList[$this->app->user->role]; + $member->role = zget($this->lang->user->roleList, $this->app->user->role, ''); $member->join = $today; $member->type = $sprintType; $member->days = $sprint->days; diff --git a/module/product/control.php b/module/product/control.php index eecb1fc2a4..af94ec9aee 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -72,11 +72,11 @@ class product extends control * @param string $status * @param int $productID * @param int $branch - * @param int $projectMine + * @param int $involved * @access public * @return void */ - public function project($status = 'all', $productID = 0, $branch = 0, $projectMine = 0) + public function project($status = 'all', $productID = 0, $branch = 0, $involved = 0) { $this->product->setMenu($this->products, $productID, $branch); $this->lang->product->switcherMenu = $this->product->getSwitcher($productID); @@ -88,7 +88,7 @@ class product extends control /* Get PM id list. */ $accounts = array(); - $projectStats = $this->product->getProjectStatsByProduct($productID, $status, $branch, $projectMine); + $projectStats = $this->product->getProjectStatsByProduct($productID, $status, $branch, $involved); foreach($projectStats as $project) { if(!empty($project->PM) and !in_array($project->PM, $accounts)) $accounts[] = $project->PM; diff --git a/module/product/js/project.js b/module/product/js/project.js index d373b2d148..55957f7588 100644 --- a/module/product/js/project.js +++ b/module/product/js/project.js @@ -1,9 +1,9 @@ $(function() { - $('#mainMenu input[name^="PRJMine"]').click(function() + $('#mainMenu input[name^="involved"]').click(function() { - var PRJMine = $(this).is(':checked') ? 1 : 0; - $.cookie('PRJMine', PRJMine, {expires:config.cookieLife, path:config.webRoot}); + var involved = $(this).is(':checked') ? 1 : 0; + $.cookie('involved', involved, {expires:config.cookieLife, path:config.webRoot}); window.location.reload(); }); }); diff --git a/module/product/model.php b/module/product/model.php index 90a25c7106..a7089f7024 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -875,11 +875,11 @@ class productModel extends model * @param int $productID * @param string $browseType * @param int $branch - * @param int $projectMine + * @param int $involved * @access public * @return array */ - public function getProjectListByProduct($productID, $browseType = 'all', $branch = 0, $projectMine = 0) + public function getProjectListByProduct($productID, $browseType = 'all', $branch = 0, $involved = 0) { $projectList = $this->dao->select('t2.*')->from(TABLE_PROJECTPRODUCT)->alias('t1') ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id') @@ -887,7 +887,7 @@ class productModel extends model ->andWhere('t2.type')->eq('project') ->beginIF($browseType != 'all')->andWhere('t2.status')->eq($browseType)->fi() ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi() - ->beginIF($this->cookie->projectMine or $projectMine) + ->beginIF($this->cookie->involved or $involved) ->andWhere('t2.openedBy', true)->eq($this->app->user->account) ->orWhere('t2.PM')->eq($this->app->user->account) ->markRight(1) @@ -910,13 +910,13 @@ class productModel extends model * @param int $productID * @param string $browseType * @param int $branch - * @param int $projectMine + * @param int $involved * @access public * @return array */ - public function getProjectStatsByProduct($productID, $browseType = 'all', $branch = 0, $projectMine = 0) + public function getProjectStatsByProduct($productID, $browseType = 'all', $branch = 0, $involved = 0) { - $projects = $this->getProjectListByProduct($productID, $browseType, $branch, $projectMine); + $projects = $this->getProjectListByProduct($productID, $browseType, $branch, $involved); if(empty($projects)) return array(); $projectKeys = array_keys($projects); diff --git a/module/product/view/project.html.php b/module/product/view/project.html.php index 5a2f067ff5..dc7964c846 100644 --- a/module/product/view/project.html.php +++ b/module/product/view/project.html.php @@ -15,7 +15,7 @@ execution->featureBar['all'] as $key => $label):?> {$label}" . ($status == $key ? " " . count($projectStats) . "" : ''), '', "class='btn btn-link" . ($status == $key ? ' btn-active-text' : '') . "' id='{$key}Tab'");?> - $lang->project->mine), '', $this->cookie->projectMine ? 'checked=checked' : '');?> + $lang->project->mine), '', $this->cookie->involved ? 'checked=checked' : '');?>
product->projectInfo;?>>
diff --git a/module/program/control.php b/module/program/control.php index b57a202211..e9a311f0e4 100644 --- a/module/program/control.php +++ b/module/program/control.php @@ -662,7 +662,7 @@ class program extends control foreach($projects as $id => $name) { $active = $data->cpoyProjectID == $id ? 'active' : ''; - $html .= "
" . html::icon($this->lang->icons['project'], 'text-muted') . $name . "
"; + $html .= "
" . html::icon($this->lang->icons['project'], 'text-muted') . $name . "
"; } echo $html; } @@ -691,7 +691,7 @@ class program extends control { $programs = $this->post->programs; foreach($programs as $id => $order) - { + { $this->dao->update(TABLE_PROJECT) ->set('`order`')->eq($order) ->where('id')->eq($id) diff --git a/module/program/model.php b/module/program/model.php index 3b22cbef6b..2ab4671d90 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -128,11 +128,11 @@ class programModel extends model * @param string $orderBy * @param object $pager * @param int $programTitle - * @param int $projectMine + * @param int $involved * @access public * @return object */ - public function getProjectList($programID = 0, $browseType = 'all', $queryID = 0, $orderBy = 'id_desc', $pager = null, $programTitle = 0, $projectMine = 0) + public function getProjectList($programID = 0, $browseType = 'all', $queryID = 0, $orderBy = 'id_desc', $pager = null, $programTitle = 0, $involved = 0) { $path = ''; if($programID) @@ -148,7 +148,7 @@ class programModel extends model ->beginIF($path)->andWhere('path')->like($path . '%')->fi() ->beginIF(!$this->app->user->admin and $this->config->systemMode == 'new')->andWhere('id')->in($this->app->user->view->projects)->fi() ->beginIF(!$this->app->user->admin and $this->config->systemMode == 'classic')->andWhere('id')->in($this->app->user->view->sprints)->fi() - ->beginIF($this->cookie->projectMine or $projectMine) + ->beginIF($this->cookie->involved or $involved) ->andWhere('openedBy', true)->eq($this->app->user->account) ->orWhere('PM')->eq($this->app->user->account) ->markRight(1) @@ -777,14 +777,14 @@ class programModel extends model * @param string $orderBy * @param object $pager * @param string $programTitle - * @param int $projectMine + * @param int $involved * @access public * @return array */ - public function getProjectStats($programID = 0, $browseType = 'undone', $queryID = 0, $orderBy = 'id_desc', $pager = null, $programTitle = 0, $projectMine = 0) + public function getProjectStats($programID = 0, $browseType = 'undone', $queryID = 0, $orderBy = 'id_desc', $pager = null, $programTitle = 0, $involved = 0) { /* Init vars. */ - $projects = $this->getProjectList($programID, $browseType, $queryID, $orderBy, $pager, $programTitle, $projectMine); + $projects = $this->getProjectList($programID, $browseType, $queryID, $orderBy, $pager, $programTitle, $involved); if(empty($projects)) return array(); $projectKeys = array_keys($projects); diff --git a/module/program/view/project.html.php b/module/program/view/project.html.php index 6a9ac21409..ed27ef503c 100644 --- a/module/program/view/project.html.php +++ b/module/program/view/project.html.php @@ -26,7 +26,7 @@ js::set('browseType', $browseType); {$pager->recTotal}";?> - $lang->project->mine), '', $this->cookie->PRJMine ? 'checked=checked' : '');?> + $lang->project->mine), '', $this->cookie->involved ? 'checked=checked' : '');?>
config->maxVersion)):?> @@ -98,10 +98,10 @@ js::set('browseType', $browseType);
diff --git a/module/project/js/browse.js b/module/project/js/browse.js index f3f57b523e..ab1080090f 100644 --- a/module/project/js/browse.js +++ b/module/project/js/browse.js @@ -1,9 +1,9 @@ $(function() { - $('#projectMine').click(function() + $('input[name^="involved"]').click(function() { - var mine = $(this).is(':checked') ? 1 : 0; - $.cookie('projectMine', mine, {expires:config.cookieLife, path:config.webRoot}); + var involved = $(this).is(':checked') ? 1 : 0; + $.cookie('involved', involved, {expires:config.cookieLife, path:config.webRoot}); window.location.reload(); }); }); diff --git a/module/project/view/browse.html.php b/module/project/view/browse.html.php index ae0bd08ef5..e77e7fc21b 100644 --- a/module/project/view/browse.html.php +++ b/module/project/view/browse.html.php @@ -35,7 +35,7 @@ js::set('browseType', $browseType); {$pager->recTotal}";?> - $lang->project->mine), '', $this->cookie->projectMine ? 'checked=checked' : '');?> + $lang->project->mine), '', $this->cookie->involved ? 'checked=checked' : '');?>
config->maxVersion)):?>