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

* The user and dept modules are loaded during construction, remove duplicate loading.

Browse Source
This commit is contained in:
liumengyi
2023-11-22 10:33:27 +08:00
parent 4c6eca5b4d
commit 122caf59c1
1 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/control.php
+18 -19
View File
@@ -53,7 +53,7 @@ class my extends control
$scores = $this->loadModel('score')->getListByAccount($this->app->user->account, $pager);
$this->view->title = $this->lang->score->common;
$this->view->user = $this->loadModel('user')->getById($this->app->user->account);
$this->view->user = $this->user->getById($this->app->user->account);
$this->view->pager = $pager;
$this->view->scores = $scores;
@@ -287,7 +287,7 @@ EOF;
$pager = new pager($recTotal, $recPerPage, $pageID);
if(empty($userID)) $userID = $this->app->user->id;
$user = $this->loadModel('user')->getById($userID, 'id');
$user = $this->user->getById($userID, 'id');
$account = $user->account;
/* The title and position. */
@@ -315,7 +315,7 @@ EOF;
$this->view->type = $type;
$this->view->status = $status;
$this->view->user = $user;
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->users = $this->user->getPairs('noletter');
$this->view->account = $this->app->user->account;
$this->view->times = date::buildTimeList($this->config->todo->times->begin, $this->config->todo->times->end, $this->config->todo->times->delta);
$this->view->time = date::now();
@@ -533,7 +533,7 @@ EOF;
$this->view->summary = $summary;
$this->view->type = $type;
$this->view->kanbanList = $this->execution->getPairs(0, 'kanban');
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->users = $this->user->getPairs('noletter');
$this->view->pager = $pager;
$this->view->mode = 'task';
$this->view->orderBy = $orderBy;
@@ -826,7 +826,7 @@ EOF;
$PMList = $this->user->getListByAccounts($accounts, 'account');
$this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->project;
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->users = $this->user->getPairs('noletter');
$this->view->projects = $projects;
$this->view->PMList = $PMList;
$this->view->pager = $pager;
@@ -904,7 +904,7 @@ EOF;
$this->view->title = $this->lang->my->issue;
$this->view->mode = 'issue';
$this->view->users = $this->loadModel('user')->getPairs('noclosed|noletter');
$this->view->users = $this->user->getPairs('noclosed|noletter');
$this->view->orderBy = $orderBy;
$this->view->pager = $pager;
$this->view->type = $type;
@@ -957,7 +957,7 @@ EOF;
$this->view->title = $this->lang->my->risk;
$this->view->risks = $risks;
$this->view->users = $this->loadModel('user')->getPairs('noclosed|noletter');
$this->view->users = $this->user->getPairs('noclosed|noletter');
$this->view->orderBy = $orderBy;
$this->view->pager = $pager;
$this->view->type = $type;
@@ -1007,7 +1007,7 @@ EOF;
}
$this->view->title = $this->lang->review->common;
$this->view->users = $this->loadModel('user')->getPairs('noclosed|noletter');
$this->view->users = $this->user->getPairs('noclosed|noletter');
$this->view->reviewList = $reviewList;
$this->view->recTotal = $recTotal;
$this->view->recPerPage = $recPerPage;
@@ -1056,7 +1056,7 @@ EOF;
$this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->auditplan;
$this->view->browseType = $browseType;
$this->view->auditplans = $auditplans;
$this->view->users = $this->loadModel('user')->getPairs('noclosed|noletter');
$this->view->users = $this->user->getPairs('noclosed|noletter');
$this->view->pager = $pager;
$this->view->orderBy = $orderBy;
$this->view->param = $param;
@@ -1093,7 +1093,7 @@ EOF;
$this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->nc;
$this->view->browseType = $browseType;
$this->view->ncs = $ncList;
$this->view->users = $this->loadModel('user')->getPairs('noclosed|noletter');
$this->view->users = $this->user->getPairs('noclosed|noletter');
$this->view->projects = $this->loadModel('project')->getPairsByProgram();
$this->view->pager = $pager;
$this->view->orderBy = $orderBy;
@@ -1136,8 +1136,8 @@ EOF;
$this->view->meetings = $this->meeting->getListByUser($browseType, $orderBy, $queryID, $pager);
$this->view->orderBy = $orderBy;
$this->view->pager = $pager;
$this->view->depts = $this->loadModel('dept')->getOptionMenu();
$this->view->users = $this->loadModel('user')->getPairs('all,noletter');
$this->view->depts = $this->dept->getOptionMenu();
$this->view->users = $this->user->getPairs('all,noletter');
$this->view->queryID = $queryID;
$this->view->mode = 'myMeeting';
$this->view->projects = array(0 => '') + $this->loadModel('project')->getPairsByProgram(0, 'all', true);
@@ -1232,8 +1232,8 @@ EOF;
$this->view->stories = $stories;
$this->view->tasks = $tasks;
$this->view->tickets = $tickets;
$this->view->depts = $this->loadModel('dept')->getOptionMenu();
$this->view->users = $this->loadModel('user')->getPairs('noletter|nodeleted|noclosed');
$this->view->depts = $this->dept->getOptionMenu();
$this->view->users = $this->user->getPairs('noletter|nodeleted|noclosed');
$this->view->projects = $this->loadModel('project')->getPairsByProgram(0, 'noclosed');
$this->view->allProducts = $this->dao->select('*')->from(TABLE_PRODUCT)->where('deleted')->eq('0')->fetchPairs('id', 'name');
$this->view->modulePairs = $this->tree->getModulePairs(0, 'feedback');
@@ -1277,7 +1277,7 @@ EOF;
$this->view->title = $this->lang->ticket->browse;
$this->view->products = $this->loadModel('feedback')->getGrantProducts();
$this->view->users = $this->loadModel('user')->getPairs('noclosed|nodeleted|noletter');
$this->view->users = $this->user->getPairs('noclosed|nodeleted|noletter');
$this->view->tickets = $tickets;
$this->view->orderBy = $orderBy;
$this->view->pager = $pager;
@@ -1574,7 +1574,7 @@ EOF;
$this->view->dateGroups = $dateGroups;
$this->view->direction = $direction;
$this->view->recTotal = $recTotal;
$this->view->users = $this->loadModel('user')->getPairs('noletter|nodeleted');
$this->view->users = $this->user->getPairs('noletter|nodeleted');
$this->display();
}
@@ -1588,7 +1588,7 @@ EOF;
{
if($_SERVER['REQUEST_METHOD'] == 'POST')
{
$result = $this->loadModel('user')->uploadAvatar();
$result = $this->user->uploadAvatar();
return $this->send(array('result' => 'success', 'callback' => "loadModal('" . helper::createLink('user', 'cropavatar', "image={$result['fileID']}") . "', 'profile');"));
}
}
@@ -1602,7 +1602,6 @@ EOF;
*/
public function unbind($confirm = 'no')
{
$this->loadModel('user');
if($confirm == 'no')
{
return print(js::confirm($this->lang->user->confirmUnbind, $this->createLink('my', 'unbind', "confirm=yes")));
@@ -1627,7 +1626,7 @@ EOF;
$this->loadModel('setting')->setItem("{$this->app->user->account}.common.global.vision", $vision);
$this->config->vision = $vision;
$_SESSION['user']->rights = $this->loadModel('user')->authorize($this->app->user->account);
$_SESSION['user']->rights = $this->user->authorize($this->app->user->account);
return $this->send(array('result' => 'success', 'load' => helper::createLink('index', 'index')));
}