From e818e038edaca3c5ec35af8e29ebe3955d523796 Mon Sep 17 00:00:00 2001 From: holan20180123 Date: Fri, 13 Aug 2021 14:00:57 +0800 Subject: [PATCH 1/9] * Finish task #41237. --- module/personnel/model.php | 5 ++++- module/personnel/view/addwhitelist.html.php | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/module/personnel/model.php b/module/personnel/model.php index cdb25bba17..1372c50f92 100644 --- a/module/personnel/model.php +++ b/module/personnel/model.php @@ -491,7 +491,10 @@ class personnelModel extends model } elseif($objectType == 'project') { - $objects = $this->loadModel('project')->getPairsByProgram(); + $path = $this->dao->select('path')->from(TABLE_PROJECT)->where('id')->eq($objectID)->fetch('path'); + $path = explode(',', trim($path, ',')); + $parentID = $path[0]; + $objects = $this->loadModel('project')->getPairsByProgram($parentID); } elseif($objectType == 'product') { diff --git a/module/personnel/view/addwhitelist.html.php b/module/personnel/view/addwhitelist.html.php index d9d07bdfc6..e2cf748926 100644 --- a/module/personnel/view/addwhitelist.html.php +++ b/module/personnel/view/addwhitelist.html.php @@ -22,10 +22,8 @@
execution->selectDept;?> execution->selectDeptTitle}'");?> - 1):?> personnel->copy;?> personnel->selectObjectTips}'");?> -
From 65c6e9a3d09c8d849e4c417aca2d9f9ef179fc33 Mon Sep 17 00:00:00 2001 From: holan20180123 Date: Fri, 13 Aug 2021 14:22:56 +0800 Subject: [PATCH 2/9] * Fix bug #13962. --- module/message/control.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/module/message/control.php b/module/message/control.php index 25616366b1..dc63edc9d6 100644 --- a/module/message/control.php +++ b/module/message/control.php @@ -33,7 +33,7 @@ class message extends control /** * Browser Setting - * + * * @access public * @return void */ @@ -80,10 +80,10 @@ class message extends control */ public function setting() { - if($_POST) + if(strtolower($this->server->request_method) == "post") { $data = fixer::input('post')->get(); - $data->messageSetting = json_encode($data->messageSetting); + $data->messageSetting = !empty($data->messageSetting) ? json_encode($data->messageSetting) : ''; $this->loadModel('setting')->setItem('system.message.setting', $data->messageSetting); return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'reload')); } From 2f2abb8294ec9571101e35cb64cd606c024c108a Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Fri, 13 Aug 2021 14:32:39 +0800 Subject: [PATCH 3/9] * Fix an error at custom doc page. --- module/doc/model.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/module/doc/model.php b/module/doc/model.php index c9dbeaaf6a..d59708b94f 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -2044,11 +2044,12 @@ class docModel extends model $currentMethod = $this->app->getMethodName(); $methodName = in_array($currentMethod, array('tablecontents', 'showfiles')) ? 'tablecontents' : 'objectLibs'; - $objectTitle = $type == 'execution' ? substr($objects[$objectID], strpos($objects[$objectID], '/') + 1) : $objects[$objectID]; if($this->app->openApp == 'doc' and $type != 'custom' and $type != 'book') { - $output = <<