From 8b45bf767d7c4e3442a0ec8425e4d060809b15a1 Mon Sep 17 00:00:00 2001 From: Catouse Date: Thu, 7 May 2020 14:50:06 +0800 Subject: [PATCH] * refactor. --- module/program/control.php | 4 ++-- module/program/model.php | 4 ++-- module/project/model.php | 16 ++++++++-------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/module/program/control.php b/module/program/control.php index fc88f1e581..667a22f289 100644 --- a/module/program/control.php +++ b/module/program/control.php @@ -46,7 +46,7 @@ class program extends control $whitelist = ''; $acl = 'open'; if($copyProgramID) - { + { $copyProgram = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->eq($copyProgramID)->fetch(); $name = $copyProgram->name; $code = $copyProgram->code; @@ -79,7 +79,7 @@ class program extends control $changes = $this->project->update($projectID); if(dao::isError()) $this->send(array('result' => 'fail', 'message' => $this->processErrors(dao::getError()))); if($changes) - { + { $actionID = $this->loadModel('action')->create('project', $projectID, 'edited'); $this->action->logHistory($actionID, $changes); } diff --git a/module/program/model.php b/module/program/model.php index f0980cbdcb..e2efcfa5a9 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -82,7 +82,7 @@ class programModel extends model $lib->product = $productID; $lib->name = $this->lang->doclib->main['product']; $lib->type = 'product'; - $lib->main = '1'; + $lib->main = '1'; $lib->acl = 'default'; $this->dao->insert(TABLE_DOCLIB)->data($lib)->exec(); @@ -114,6 +114,6 @@ class programModel extends model public function getProducts($program) { - return $this->dao->select('*')->from(TABLE_PRODUCT)->where('project')->eq($program)->fetchAll('id'); + return $this->dao->select('*')->from(TABLE_PRODUCT)->where('project')->eq($program)->fetchAll('id'); } } diff --git a/module/project/model.php b/module/project/model.php index b670981e00..3227c68615 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -1121,9 +1121,9 @@ class projectModel extends model /** * Get ordered projects. - * - * @param string $status - * @param int $num + * + * @param string $status + * @param int $num * @access public * @return array */ @@ -2051,7 +2051,7 @@ class projectModel extends model ->andWhere('t1.id')->in(array_keys($taskIdList)) ->orderBy($orderBy) ->fetchAll('id'); - + if(empty($tasks)) return array(); $taskTeam = $this->dao->select('*')->from(TABLE_TEAM)->where('root')->in(array_keys($tasks))->andWhere('type')->eq('task')->fetchGroup('root'); @@ -2066,10 +2066,10 @@ class projectModel extends model if($task->parent > 0) $parents[$task->parent] = $task->parent; } $parents = $this->dao->select('*')->from(TABLE_TASK)->where('id')->in($parents)->fetchAll('id'); - + foreach($tasks as $task) { - if($task->parent > 0) + if($task->parent > 0) { if(isset($tasks[$task->parent])) { @@ -3000,8 +3000,8 @@ class projectModel extends model /** * Update user view of project and it's product. - * - * @param int $projectID + * + * @param int $projectID * @access public * @return void */