* Fix bug.

This commit is contained in:
leiyong
2020-11-03 16:04:37 +08:00
parent 1004009e7b
commit 3b7cba9049
4 changed files with 8 additions and 7 deletions
Binary file not shown.
+2 -2
View File
@@ -73,8 +73,8 @@ class issue extends control
$this->view->users = $this->loadModel('user')->getPairs('noclosed|nodeleted');
$this->view->owners = $this->loadModel('stakeholder')->getStakeholders4Issue();
$this->view->from = $from;
$this->view->owner = $owner;
$this->view->from = $from;
$this->view->owner = $owner;
$this->display();
}
+1 -1
View File
@@ -12,7 +12,7 @@
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?>
<div class="main-content" id="mainCentent">
<div class="main-content" id="mainCentent" <?php if(isonlybody()) echo 'style="margin-top: 40px;"';?>>
<div class="center-block">
<div class="main-header">
<h2><?php echo $lang->issue->create;?></h2>
+5 -4
View File
@@ -1937,10 +1937,11 @@ class project extends control
$this->loadModel('user');
$this->loadModel('dept');
$project = $this->project->getById($projectID);
$users = $this->user->getPairs('noclosed|nodeleted|devfirst|nofeedback', '', $this->config->maxCount);
$roles = $this->user->getUserRoles(array_keys($users));
$deptUsers = $dept === '' ? array() : $this->dept->getDeptUserPairs($dept);
$project = $this->project->getById($projectID);
$users = $this->user->getPairs('noclosed|nodeleted|devfirst|nofeedback', '', $this->config->maxCount);
$roles = $this->user->getUserRoles(array_keys($users));
$deptUsers = empty($dept) ? array() : $this->dept->getDeptUserPairs($dept);
$currentMembers = $this->project->getTeamMembers($projectID);
$members2Import = $this->project->getMembers2Import($team2Import, array_keys($currentMembers));
$teams2Import = $this->project->getTeams2Import($this->app->user->account, $projectID);