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

* user: rename users to deptUsers to avoid naming conflicts.

Browse Source
This commit is contained in:
liugang
2023-11-22 11:04:58 +08:00
parent 0e3a72e0a2
commit 992191f2bb
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/user/control.php
+8 -8
View File
@@ -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();
}
module/user/ui/featurebar.html.php
+1 -1
View File
@@ -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)"))