From 701d007a9f732269ea2f6a7707187cdec6be32cf Mon Sep 17 00:00:00 2001 From: wangyidong Date: Wed, 27 Apr 2022 13:40:47 +0800 Subject: [PATCH] * code for bug #22030. --- module/programplan/model.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/module/programplan/model.php b/module/programplan/model.php index 3f522166b4..6902119832 100644 --- a/module/programplan/model.php +++ b/module/programplan/model.php @@ -775,6 +775,9 @@ class programplanModel extends model if($planChanged) $plan->version = $oldPlan->version + 1; if(empty($plan->parent)) $plan->parent = $projectID; + /* Fix bug #22030. Reset field name for show dao error. */ + $this->lang->project->name = $this->lang->programplan->name; + $this->dao->update(TABLE_PROJECT)->data($plan) ->autoCheck() ->batchCheck($this->config->programplan->edit->requiredFields, 'notempty') @@ -920,6 +923,8 @@ class programplanModel extends model */ public function isCreateTask($planID) { + if(empty($planID)) return true; + $task = $this->dao->select('*')->from(TABLE_TASK)->where('execution')->eq($planID)->andWhere('deleted')->eq('0')->limit(1)->fetch(); return empty($task) ? true : false; }