Merge branch '180'

2022-01-04 22:41:23 +08:00
parent a2bd7cfcf3 44b222eca6
commit c8db935f34
84 changed files with 627 additions and 253 deletions
@@ -1429,6 +1429,13 @@ class actionModel extends model
    {
        $action = $this->getById($actionID);
        if($action->action != 'deleted') return;
+
+        if($action->objectType == 'execution')
+        {
+            $execution = $this->dao->select('*')->from(TABLE_EXECUTION)->where('id')->eq($action->objectID)->fetch();
+            if($execution->deleted and empty($execution->project)) return print(js::error($this->lang->action->undeletedTips));
+        }
+
        if($action->objectType == 'product')
        {
            $product = $this->dao->select('id,name,code,acl')->from(TABLE_PRODUCT)->where('id')->eq($action->objectID)->fetch();