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

* Change the team name at the time of creation execution.

Browse Source
This commit is contained in:
tianshujie
2021-08-25 15:15:09 +08:00
parent 80b869fd76
commit 57e1f5d63d
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/css/common.css
+1
View File
@@ -27,3 +27,4 @@
#whitelistBox .checkbox-inline, #whitelistBox .radio-inline {margin-left: 10px; display: inline-block; padding-left: 0px; padding-right: 10px;}
.main-table > .table-responsive {padding: 0 1px; background: #fff;}
#teams_chosen ul li:first-child {max-width:256px; display: inline-block; vertical-align: middle;}
module/execution/js/create.js
+1 -1
View File
@@ -46,7 +46,7 @@ $(function()
$('#teams_chosen').click(function()
{
if(systemMode == 'new') $('#teams_chosen ul li:first').append(' <label class="label">' + projectCommon + '</label>');
if(systemMode == 'new') $('#teams_chosen ul li:first').after(' <label class="label">' + projectCommon + '</label>');
})
$('#teams').change(function()
module/execution/model.php
+3 -3
View File
@@ -2454,7 +2454,7 @@ class executionModel extends model
{
if(empty($projectID)) return array();
$teams = $this->dao->select('id,team,type')->from(TABLE_PROJECT)
$teams = $this->dao->select('id,name,type')->from(TABLE_PROJECT)
->where('deleted')->eq(0)
->andWhere('(project')->eq($projectID)
->orWhere('id')->eq($projectID)
@@ -2466,10 +2466,10 @@ class executionModel extends model
$teamPairs = array();
foreach($teams as $id => $team)
{
if(empty($team->team)) continue;
if(empty($team->name)) continue;
$prefix = ($team->type != 'project' and $this->config->systemMode == 'new') ? '&nbsp;&nbsp;&nbsp;' : '';
$teamPairs[$id] = $prefix . $team->team;
$teamPairs[$id] = $prefix . $team->name;
}
return $teamPairs;