diff --git a/module/user/control.php b/module/user/control.php index 272f49e6c7..f1211a4657 100755 --- a/module/user/control.php +++ b/module/user/control.php @@ -71,14 +71,14 @@ class user extends control $users = $this->loadModel('dept')->getDeptUserPairs($deptID, 'id'); if(!isset($users[$userID])) return $this->send(array('result' => 'fail', 'load' => array('alert' => $this->lang->user->error->noAccess, 'locate' => array('back' => true)))); - $this->view->title = $this->lang->user->common . $this->lang->colon . $this->lang->user->todo; - $this->view->users = $users; - $this->view->todos = $todos; - $this->view->user = $user; - $this->view->type = $type; - $this->view->status = $status; - $this->view->orderBy = $orderBy; - $this->view->pager = $pager; + $this->view->title = $this->lang->user->common . $this->lang->colon . $this->lang->user->todo; + $this->view->deptUsers = $users; + $this->view->todos = $todos; + $this->view->user = $user; + $this->view->type = $type; + $this->view->status = $status; + $this->view->orderBy = $orderBy; + $this->view->pager = $pager; $this->display(); } diff --git a/module/user/ui/featurebar.html.php b/module/user/ui/featurebar.html.php index ee856b9a49..576f3f138c 100755 --- a/module/user/ui/featurebar.html.php +++ b/module/user/ui/featurebar.html.php @@ -12,7 +12,7 @@ featureBar picker ( width('120px'), - set::items($users), + set::items($deptUsers), set::value($user->id), set::required(true), set::onChange(jsRaw("(value) => switchAccount(value)"))