diff --git a/module/dept/.model.php.swp b/module/dept/.model.php.swp new file mode 100644 index 0000000000..4f98840ec5 Binary files /dev/null and b/module/dept/.model.php.swp differ diff --git a/module/issue/control.php b/module/issue/control.php index 265e835850..0459df5902 100644 --- a/module/issue/control.php +++ b/module/issue/control.php @@ -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(); } diff --git a/module/issue/view/create.html.php b/module/issue/view/create.html.php index a392e3daa9..e58fc385c1 100644 --- a/module/issue/view/create.html.php +++ b/module/issue/view/create.html.php @@ -12,7 +12,7 @@ ?> -
+
>

issue->create;?>

diff --git a/module/project/control.php b/module/project/control.php index 3d936e5bda..b862a656f5 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -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);