From 9c8dc66eea31c260ece5cbb29dd52c9532380cda Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Mon, 28 Dec 2020 14:35:50 +0800 Subject: [PATCH 01/11] * Modify language item of batch unlink stakeholder. --- module/program/lang/de.php | 1 + module/program/lang/en.php | 1 + module/program/lang/fr.php | 1 + module/program/lang/vi.php | 1 + module/program/lang/zh-cn.php | 1 + module/program/lang/zh-tw.php | 1 + module/program/view/pgmstakeholder.html.php | 2 +- 7 files changed, 7 insertions(+), 1 deletion(-) diff --git a/module/program/lang/de.php b/module/program/lang/de.php index 7afc677441..d06acdb52f 100644 --- a/module/program/lang/de.php +++ b/module/program/lang/de.php @@ -195,6 +195,7 @@ $lang->program->PGMExport = 'Export'; $lang->program->PGMStakeholder = 'Stakeholder'; $lang->program->createStakeholder = 'Create Stakeholder'; $lang->program->unlinkStakeholder = 'Unlink Stakeholder'; +$lang->program->unlink = 'Unlink'; $lang->program->stakeholderType = 'Stakeholder type'; $lang->program->isStakeholderKey = 'Key stakeholder'; $lang->program->importStakeholder = 'Import program'; diff --git a/module/program/lang/en.php b/module/program/lang/en.php index fd8a597979..2d6ddd953b 100644 --- a/module/program/lang/en.php +++ b/module/program/lang/en.php @@ -195,6 +195,7 @@ $lang->program->PGMExport = 'Export'; $lang->program->PGMStakeholder = 'Stakeholder'; $lang->program->createStakeholder = 'Create Stakeholder'; $lang->program->unlinkStakeholder = 'Unlink Stakeholder'; +$lang->program->unlink = 'Unlink'; $lang->program->stakeholderType = 'Stakeholder type'; $lang->program->isStakeholderKey = 'Key stakeholder'; $lang->program->importStakeholder = 'Import program'; diff --git a/module/program/lang/fr.php b/module/program/lang/fr.php index 7afc677441..d06acdb52f 100644 --- a/module/program/lang/fr.php +++ b/module/program/lang/fr.php @@ -195,6 +195,7 @@ $lang->program->PGMExport = 'Export'; $lang->program->PGMStakeholder = 'Stakeholder'; $lang->program->createStakeholder = 'Create Stakeholder'; $lang->program->unlinkStakeholder = 'Unlink Stakeholder'; +$lang->program->unlink = 'Unlink'; $lang->program->stakeholderType = 'Stakeholder type'; $lang->program->isStakeholderKey = 'Key stakeholder'; $lang->program->importStakeholder = 'Import program'; diff --git a/module/program/lang/vi.php b/module/program/lang/vi.php index 7afc677441..d06acdb52f 100644 --- a/module/program/lang/vi.php +++ b/module/program/lang/vi.php @@ -195,6 +195,7 @@ $lang->program->PGMExport = 'Export'; $lang->program->PGMStakeholder = 'Stakeholder'; $lang->program->createStakeholder = 'Create Stakeholder'; $lang->program->unlinkStakeholder = 'Unlink Stakeholder'; +$lang->program->unlink = 'Unlink'; $lang->program->stakeholderType = 'Stakeholder type'; $lang->program->isStakeholderKey = 'Key stakeholder'; $lang->program->importStakeholder = 'Import program'; diff --git a/module/program/lang/zh-cn.php b/module/program/lang/zh-cn.php index da1aa24333..8c27f7ab5d 100644 --- a/module/program/lang/zh-cn.php +++ b/module/program/lang/zh-cn.php @@ -195,6 +195,7 @@ $lang->program->PGMExport = '导出'; $lang->program->PGMStakeholder = '干系人列表'; $lang->program->createStakeholder = '添加干系人'; $lang->program->unlinkStakeholder = '移除干系人'; +$lang->program->unlink = '移除'; $lang->program->stakeholderType = '干系人类型'; $lang->program->isStakeholderKey = '关键干系人'; $lang->program->importStakeholder = '从父项目集导入'; diff --git a/module/program/lang/zh-tw.php b/module/program/lang/zh-tw.php index d12ede9ca6..6536b6b8b0 100644 --- a/module/program/lang/zh-tw.php +++ b/module/program/lang/zh-tw.php @@ -195,6 +195,7 @@ $lang->program->PGMExport = '導出'; $lang->program->PGMStakeholder = '干係人列表'; $lang->program->createStakeholder = '添加干係人'; $lang->program->unlinkStakeholder = '移除干係人'; +$lang->program->unlink = '移除'; $lang->program->stakeholderType = '干係人類型'; $lang->program->isStakeholderKey = '關鍵干係人'; $lang->program->importStakeholder = '從父項目集導入'; diff --git a/module/program/view/pgmstakeholder.html.php b/module/program/view/pgmstakeholder.html.php index 64da8e9d56..cf471b5ae2 100644 --- a/module/program/view/pgmstakeholder.html.php +++ b/module/program/view/pgmstakeholder.html.php @@ -72,7 +72,7 @@
createLink('program', 'batchUnlinkStakeholders', "programID=$programID");?> - delete, "onclick=\"setFormAction('$actionLink', 'hiddenwin')\"");?> + program->unlink, "onclick=\"setFormAction('$actionLink', 'hiddenwin')\"");?>
show('right', 'pagerjs');?> From 507ae60194a0893addc87226228d47b5a9a1f71d Mon Sep 17 00:00:00 2001 From: hufangzhou <746775970@qq.com> Date: Mon, 28 Dec 2020 14:45:55 +0800 Subject: [PATCH 02/11] * Adjust the function comment. --- module/product/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/product/model.php b/module/product/model.php index 71240a2c9c..8ceec931d3 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -602,7 +602,7 @@ class productModel extends model * Batch update products. * * @access public - * @return void + * @return array */ public function batchUpdate() { From 494b5f549c42fd2fbbc43912bacb5c0f2060f65b Mon Sep 17 00:00:00 2001 From: hufangzhou <746775970@qq.com> Date: Mon, 28 Dec 2020 14:47:56 +0800 Subject: [PATCH 03/11] * Adjust the function comment. --- module/product/model.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/product/model.php b/module/product/model.php index 8ceec931d3..7487720b01 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -1106,6 +1106,7 @@ class productModel extends model * @param string $status * @param int $line * @param string $storyType requirement|story + * @param int $programID * @access public * @return array */ From b20054087c2f505d2c5fa3a53e389dfad121694c Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Mon, 28 Dec 2020 14:49:14 +0800 Subject: [PATCH 04/11] * Fix bug. --- module/issue/model.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/issue/model.php b/module/issue/model.php index 79138fa598..a1b43ece29 100644 --- a/module/issue/model.php +++ b/module/issue/model.php @@ -334,6 +334,7 @@ class issueModel extends model $issue['createdBy'] = $this->app->user->account; $issue['createdDate'] = $now; $issue['PRJ'] = $this->session->PRJ; + $issue['status'] = 'unconfirmed'; if($issue['assignedTo']) { From 4b1ae38ac0f268a7bebf66b44da992a8dd42f892 Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Mon, 28 Dec 2020 15:06:39 +0800 Subject: [PATCH 05/11] * Optimize the code. --- module/stakeholder/control.php | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/module/stakeholder/control.php b/module/stakeholder/control.php index d8c86b8cd6..f500d24c7b 100644 --- a/module/stakeholder/control.php +++ b/module/stakeholder/control.php @@ -57,17 +57,15 @@ class stakeholder extends control } $actionID = $this->loadModel('action')->create('stakeholder', $stakeholderID, 'added'); - $response['locate'] = $programID == 0 ? $this->createLink('stakeholder', 'browse', '') : $this->createLink('program', 'pgmStakeholder', "programID=$programID"); - $this->send($response); + + $moduleName = $programID ? 'program' : $this->moduleName; + $methodName = $programID ? 'pgmstakeholder' : 'browse'; + $param = $programID ? "programID=$programID" : ''; + $locate = $this->createLink($moduleName, $methodName, $param); + $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locate)); } - if($programID == 0) - { - $this->view->title = $this->lang->stakeholder->create; - $this->view->position[] = $this->lang->stakeholder->create; - $this->view->members = $this->loadModel('project')->getTeamMemberPairs($this->session->PRJ); - } - else + if($programID) { $this->loadModel('program'); $this->app->rawModule = 'program'; @@ -76,13 +74,17 @@ class stakeholder extends control $this->lang->program->switcherMenu = $this->program->getPGMCommonAction() . $this->program->getPGMSwitcher($programID, true); $this->program->setPGMViewMenu($programID); - $this->view->title = $this->lang->program->createStakeholder; - $this->view->position[] = $this->lang->program->createStakeholder; - $this->view->members = $this->program->getPRJTeamMemberPairs($programID); + $this->view->members = $this->program->getPRJTeamMemberPairs($programID); + } + else + { + $this->view->members = $this->loadModel('project')->getTeamMemberPairs($this->session->PRJ); } - $this->view->companys = $this->loadModel('company')->getOutsideCompanies(); - $this->view->programID = $programID; + $this->view->title = $this->lang->stakeholder->create; + $this->view->position[] = $this->lang->stakeholder->create; + $this->view->companys = $this->loadModel('company')->getOutsideCompanies(); + $this->view->programID = $programID; $this->display(); } From b8598ce6ce47a620a6eabbd5b8b5c17d84819feb Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Mon, 28 Dec 2020 15:17:10 +0800 Subject: [PATCH 06/11] * Adjust code style. --- module/my/view/project.html.php | 2 +- module/product/model.php | 3 ++- module/productplan/js/browse.js | 4 ++-- module/program/view/pgmbrowsebylist.html.php | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/module/my/view/project.html.php b/module/my/view/project.html.php index 0f85ea71e7..8b6345bc3e 100644 --- a/module/my/view/project.html.php +++ b/module/my/view/project.html.php @@ -39,7 +39,7 @@ idAB;?> program->PRJName;?> program->PRJCode;?> - program->PRJStatus;?> + program->PRJStatus;?> program->begin;?> program->end;?> program->PRJBudget;?> diff --git a/module/product/model.php b/module/product/model.php index 7487720b01..52b8d87584 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -811,7 +811,7 @@ class productModel extends model * @param int $productID * @param int $branch * @access public - * @return void + * @return array */ public function getProjectPairsByProduct($productID, $branch = 0) { @@ -1222,6 +1222,7 @@ class productModel extends model foreach($products as $product) $programKeys[] = $product->program; $programs = $this->dao->select('id,name')->from(TABLE_PROGRAM) ->where('id')->in(array_unique($programKeys)) + ->andWhere('deleted')->eq('0') ->fetchPairs(); foreach($products as $product) $product->programName = isset($programs[$product->program]) ? $programs[$product->program] : ''; diff --git a/module/productplan/js/browse.js b/module/productplan/js/browse.js index d5765c2c1f..85b3864e43 100644 --- a/module/productplan/js/browse.js +++ b/module/productplan/js/browse.js @@ -22,8 +22,8 @@ $(function() $('#createExecutionButton').on('click', function() { - var PRJID = $('#project').val(); - var planID = $('#planID').val(); + var PRJID = $('#project').val(); + var planID = $('#planID').val(); parent.location.href = createLink('project', 'create', 'productID=' + productID + '&projectID=©ProjectID=&planID=' + planID, '', '', PRJID); }); }); diff --git a/module/program/view/pgmbrowsebylist.html.php b/module/program/view/pgmbrowsebylist.html.php index 67402a77df..cb8307143c 100644 --- a/module/program/view/pgmbrowsebylist.html.php +++ b/module/program/view/pgmbrowsebylist.html.php @@ -71,7 +71,7 @@ id", '', 'list', 'edit');?> id", '', 'list', 'treemap-alt', '', '', '', '', $this->lang->program->PGMChildren);?> - createLink("program", "pgmdelete", "programID=$program->id"), "", 'hiddenwin', "class='btn' title='{$this->lang->program->PGMDelete}'");?> + createLink("program", "PGMDelete", "programID=$program->id"), "", 'hiddenwin', "class='btn' title='{$this->lang->program->PGMDelete}'");?> status == 'wait' || $program->status == 'suspended') common::printIcon('program', 'PRJStart', "projectID=$program->id", $program, 'list', 'play', '', 'iframe', true);?> @@ -93,7 +93,7 @@ From 49134bc66b9d4795ded0fd1c1fcf44768a99d35d Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Mon, 28 Dec 2020 15:27:36 +0800 Subject: [PATCH 07/11] * Adjust to get recent executions. --- module/common/model.php | 23 +------------------ module/common/view/header.html.php | 32 -------------------------- module/index/js/index.js | 37 ++++++++++++++++++++++++++++++ module/project/model.php | 2 +- www/theme/default/style.css | 1 - 5 files changed, 39 insertions(+), 56 deletions(-) diff --git a/module/common/model.php b/module/common/model.php index ee0852a2c6..e888d08dbe 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -599,28 +599,7 @@ class commonModel extends model { global $dbh, $lang, $app; echo "
  • "; - echo '
  • ' . $lang->recent . '
    • '; - - $extraWhere = empty($app->user->admin) ? ' and id in (' . $app->user->view->sprints . ') and project in (' . $app->user->view->projects . ') ' : ''; - - if(empty($app->user->admin) && (empty($app->user->view->sprints) || empty($app->user->view->projects))) - { - echo "\n"; - return false; - } - - $executions = $dbh->query('select id,name,code,project from ' . TABLE_PROJECT . " where type in ('stage','sprint') $extraWhere and status != 'closed' and deleted = '0' order by id desc limit 6")->fetchAll(); - - if(!empty($executions)) - { - foreach($executions as $index => $execution) - { - if($index == 5) break; - $execution->code = empty($execution->code) ? $execution->name : $execution->code; - echo '
  • ' . html::a(helper::createLink('project', 'task', 'projectID=' . $execution->id, '', false, $execution->project), $execution->code, '', "style='padding: 2px 8px 2px 8px;' class='main-recent-text' title='$execution->name'") . '
    • '; - } - if(count($executions) > 5) echo '
  • ' . $lang->more . '
    • '; - } + echo '
  • ' . $lang->recent . '
    • '; } /** diff --git a/module/common/view/header.html.php b/module/common/view/header.html.php index 8317877d4e..aeffc8c50b 100755 --- a/module/common/view/header.html.php +++ b/module/common/view/header.html.php @@ -49,38 +49,6 @@ include 'chosen.html.php';
    sso->redirect)) echo "class='ranzhiFixedTfootAction'";?> > diff --git a/module/index/js/index.js b/module/index/js/index.js index b79947b6d9..8bb947caaf 100644 --- a/module/index/js/index.js +++ b/module/index/js/index.js @@ -315,3 +315,40 @@ else openTab(defaultTabGroup); }); }()); + +/* Click to show more. */ +$("#menuToggle").bind('click', function() +{ + $("#moreExecution").hide(); +}); + +/* Mouse in to show more. */ +$("#executionList").mouseover(function() +{ + $("#moreExecution").show(); +}); + +/* Mouse out hide more. */ +$("#executionList").mouseout(function() +{ + $("#moreExecution").hide(); +}); + +/* Get recent executions. */ +function getExecutions() +{ + $("#moreExecution").toggle(); + if(!$("#moreExecution").is(':hidden')) + { + $.ajax( + { + url: createLink('project', 'ajaxGetRecentExecutions'), + dataType: 'html', + type: 'post', + success: function(data) + { + $("#executionList").html(data); + } + }) + } +} diff --git a/module/project/model.php b/module/project/model.php index dcba2891c3..860c1aa1a4 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -3574,7 +3574,7 @@ class projectModel extends model ->andWhere('status')->ne('closed') ->andWhere('deleted')->eq('0') ->orderBy('id_desc') - ->limit('5,' . $this->config->project->recentQuantity) + ->limit($this->config->project->recentQuantity) ->fetchAll(); } } diff --git a/www/theme/default/style.css b/www/theme/default/style.css index 0deed3f88b..c0008ff98f 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -51,7 +51,6 @@ a.showMoreImage:hover {opacity: 1;} #mainMenu .pull-right > .btn-group > .btn-icon:hover {background: #fff;} #mainRecent {padding: 8px; line-height: 20px; cursor: pointer; color: #fff; -moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; -khtml-user-select: none; user-select:none;} -#loadMore {cursor:pointer;} #moreExecution {display:none; max-height: 420px; position: fixed; bottom: 0; left: 100px; z-index: 999; background: white; padding: 20px 10px; height: 420px; margin-bottom: 40px; border: 1px solid #efefef} #moreExecution > .list-group {height: 380px; min-width: 150px; max-width:200px;} .main-recent-text{overflow: hidden; white-space: nowrap;} From 4acf89e28658952e51221f9b8a0871f604475f01 Mon Sep 17 00:00:00 2001 From: hufangzhou <746775970@qq.com> Date: Mon, 28 Dec 2020 15:35:26 +0800 Subject: [PATCH 08/11] * Finish task#8761. --- module/personnel/control.php | 3 +++ module/personnel/lang/de.php | 2 ++ module/personnel/lang/en.php | 2 ++ module/personnel/lang/fr.php | 2 ++ module/personnel/lang/vi.php | 2 ++ module/personnel/lang/zh-cn.php | 2 ++ module/personnel/lang/zh-tw.php | 2 ++ module/personnel/model.php | 19 +++---------------- module/personnel/view/accessible.html.php | 6 +++++- 9 files changed, 23 insertions(+), 17 deletions(-) diff --git a/module/personnel/control.php b/module/personnel/control.php index 38fbf1247b..e7ab9b9d01 100644 --- a/module/personnel/control.php +++ b/module/personnel/control.php @@ -29,6 +29,8 @@ class personnel extends control $this->setProgramNavMenu($programID); $this->app->loadLang('user'); + $program = $this->loadModel('program')->getPGMByID($programID); + /* Set the pager. */ $this->app->loadClass('pager', true); $pager = pager::init($recTotal, $recPerPage, $pageID); @@ -45,6 +47,7 @@ class personnel extends control $this->view->deptID = $deptID; $this->view->programID = $programID; + $this->view->acl = $program->acl; $this->view->recTotal = $recTotal; $this->view->recPerPage = $recPerPage; $this->view->pageID = $pageID; diff --git a/module/personnel/lang/de.php b/module/personnel/lang/de.php index 3157c67a23..a0546708dc 100644 --- a/module/personnel/lang/de.php +++ b/module/personnel/lang/de.php @@ -21,3 +21,5 @@ $lang->personnel->whitelist = 'Whitelist'; $lang->personnel->addWhitelist = 'Add Whitelist'; $lang->personnel->unbindWhielist = 'Remove Whitelist'; $lang->personnel->confirmDelete = 'Confirm removal of the user from the whitelist?'; + +$lang->personnel->openedPGMTip = 'The program is public and can be accessed by users with Program privileges.'; diff --git a/module/personnel/lang/en.php b/module/personnel/lang/en.php index 3157c67a23..a0546708dc 100644 --- a/module/personnel/lang/en.php +++ b/module/personnel/lang/en.php @@ -21,3 +21,5 @@ $lang->personnel->whitelist = 'Whitelist'; $lang->personnel->addWhitelist = 'Add Whitelist'; $lang->personnel->unbindWhielist = 'Remove Whitelist'; $lang->personnel->confirmDelete = 'Confirm removal of the user from the whitelist?'; + +$lang->personnel->openedPGMTip = 'The program is public and can be accessed by users with Program privileges.'; diff --git a/module/personnel/lang/fr.php b/module/personnel/lang/fr.php index 3157c67a23..a0546708dc 100644 --- a/module/personnel/lang/fr.php +++ b/module/personnel/lang/fr.php @@ -21,3 +21,5 @@ $lang->personnel->whitelist = 'Whitelist'; $lang->personnel->addWhitelist = 'Add Whitelist'; $lang->personnel->unbindWhielist = 'Remove Whitelist'; $lang->personnel->confirmDelete = 'Confirm removal of the user from the whitelist?'; + +$lang->personnel->openedPGMTip = 'The program is public and can be accessed by users with Program privileges.'; diff --git a/module/personnel/lang/vi.php b/module/personnel/lang/vi.php index 3157c67a23..a0546708dc 100644 --- a/module/personnel/lang/vi.php +++ b/module/personnel/lang/vi.php @@ -21,3 +21,5 @@ $lang->personnel->whitelist = 'Whitelist'; $lang->personnel->addWhitelist = 'Add Whitelist'; $lang->personnel->unbindWhielist = 'Remove Whitelist'; $lang->personnel->confirmDelete = 'Confirm removal of the user from the whitelist?'; + +$lang->personnel->openedPGMTip = 'The program is public and can be accessed by users with Program privileges.'; diff --git a/module/personnel/lang/zh-cn.php b/module/personnel/lang/zh-cn.php index 7b82c4054f..bb0dd97853 100644 --- a/module/personnel/lang/zh-cn.php +++ b/module/personnel/lang/zh-cn.php @@ -21,3 +21,5 @@ $lang->personnel->whitelist = '白名单列表'; $lang->personnel->addWhitelist = '添加白名单'; $lang->personnel->unbindWhielist = '删除白名单'; $lang->personnel->confirmDelete = '确认将该用户移除白名单？'; + +$lang->personnel->openedPGMTip = '该项目集是公开状态，有项目集视图权限的人员即可访问。'; diff --git a/module/personnel/lang/zh-tw.php b/module/personnel/lang/zh-tw.php index e831503c7f..d03fb232c9 100644 --- a/module/personnel/lang/zh-tw.php +++ b/module/personnel/lang/zh-tw.php @@ -21,3 +21,5 @@ $lang->personnel->whitelist = '白名單列表'; $lang->personnel->addWhitelist = '添加白名單'; $lang->personnel->unbindWhielist = '刪除白名單'; $lang->personnel->confirmDelete = '確認將該用戶移除白名單？'; + +$lang->personnel->openedPGMTip = '該項目集是公開狀態，有項目集視圖權限的人員即可訪問。'; diff --git a/module/personnel/model.php b/module/personnel/model.php index 80be383e66..3c6f0d3368 100644 --- a/module/personnel/model.php +++ b/module/personnel/model.php @@ -40,22 +40,8 @@ class personnelModel extends model /* Determine who can be accessed based on access control. */ $program = $this->loadModel('program')->getPGMByID($programID); - if($program->acl == 'open') - { - /* The program is public, and users are judged to be accessible by permission groups. */ - $accessibleGroupID = $this->loadModel('group')->getAccessProgramGroup(); - $personnelList = $this->dao->select('t1.account,t3.role,t3.dept,t3.realname,t3.gender,t3.id')->from(TABLE_USERGROUP)->alias('t1') - ->leftJoin(TABLE_GROUPPRIV)->alias('t2')->on('t1.group = t2.group') - ->leftJoin(TABLE_USER)->alias('t3')->on('t1.account = t3.account') - ->where('t1.group')->in($accessibleGroupID) - ->andWhere('t2.module')->eq('program') - ->andWhere('t2.method')->eq('PGMBrowse') - ->beginIF($deptID > 0)->andWhere('t3.dept')->eq($deptID)->fi() - ->beginIF($browseType == 'bysearch')->andWhere($accessibleQuery)->fi() - ->page($pager) - ->fetchAll('account'); - } - else + $personnelList = array(); + if($program->acl != 'open') { $personnelList = $this->dao->select('t2.id,t2.dept,t2.account,t2.role,t2.realname,t2.gender')->from(TABLE_USERVIEW)->alias('t1') ->leftJoin(TABLE_USER)->alias('t2')->on('t1.account=t2.account') @@ -264,6 +250,7 @@ class personnelModel extends model $acl->type = $type; $acl->source = $source; $this->dao->insert(TABLE_ACL)->data($acl)->autoCheck()->exec(); + if(!dao::isError()) $this->loadModel('user')->updateUserView($acl->objectID, $acl->objectType, $acl->account); $accounts[$account] = $account; } diff --git a/module/personnel/view/accessible.html.php b/module/personnel/view/accessible.html.php index 667fb459ea..80c93558d6 100644 --- a/module/personnel/view/accessible.html.php +++ b/module/personnel/view/accessible.html.php @@ -12,6 +12,7 @@ +