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

Merge branch 'sprint/191_liumengyi_54336' into 'master'

Browse Source 
Sprint/191 liumengyi 54336

See merge request easycorp/zentaopms!3474
This commit is contained in:
孙广明
2022-05-18 03:17:58 +00:00
parent cc83dcc446 e83da7c524
commit cecff5ddec
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+1 -1
View File
@@ -1452,7 +1452,7 @@ class execution extends control
$this->view->name = $name;
$this->view->code = $code;
$this->view->team = $team;
$this->view->teams = array(0 => '') + $this->execution->getCanCopyObjects((int)$projectID);
$this->view->teams = array(0 => '', $projectID => $project->name) + $this->execution->getCanCopyObjects((int)$projectID);
$this->view->allProjects = array(0 => '') + $this->project->getPairsByModel('all', 0, 'noclosed');
$this->view->executionID = $executionID;
$this->view->productID = $productID;
module/execution/js/create.js
+1 -1
View File
@@ -73,7 +73,7 @@ $(function()
});
})
if(copyExecutionID != 0) $('#teams').change();
if(copyExecutionID != 0 || projectID != 0) $('#teams').change();
var acl = $("[name^='acl']:checked").val();
setWhite(acl);
module/execution/model.php
+1
View File
@@ -2703,6 +2703,7 @@ class executionModel extends model
$objectPairs = $this->dao->select('id,name')->from(TABLE_PROJECT)
->where('deleted')->eq(0)
->andWhere('type')->ne('project')
->andWhere('(project')->eq($projectID)
->orWhere('id')->eq($projectID)
->markRight(1)
module/execution/view/create.html.php
+1 -1
View File
@@ -183,7 +183,7 @@
</tr>
<tr>
<th><?php echo $lang->execution->copyTeam;?></th>
<td><?php echo html::select('teams', $teams, $copyExecutionID, "class='form-control chosen' data-placeholder='{$lang->execution->copyTeamTip}'"); ?></td>
<td><?php echo html::select('teams', $teams, empty($copyExecution) ? $projectID : $copyExecutionID, "class='form-control chosen' data-placeholder='{$lang->execution->copyTeamTip}'"); ?></td>
</tr>
<tr>
<th rowspan='2'><?php echo $lang->execution->owner;?></th>