From b08ff50930b82385ddaa38998dd0a1625fa0c66b Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Tue, 20 Jun 2023 05:30:20 +0000
Subject: [PATCH]  * Refactor the edit view of testtask.

---
 module/testtask/control.php      |   2 +-
 module/testtask/model.php        |  10 +--
 module/testtask/ui/edit.html.php | 148 +++++++++++++++++++++++++++++++
 3 files changed, 154 insertions(+), 6 deletions(-)
 create mode 100644 module/testtask/ui/edit.html.php

diff --git a/module/testtask/control.php b/module/testtask/control.php
index b7b0ea721a..8e76f2730b 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -779,7 +779,7 @@ class testtask extends control
             if($message) $this->lang->saveSuccess = $message;
 
             $link = isonlybody() ? 'parent' : $this->session->testtaskList;
-            return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $link));
+            return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => $link));
         }
 
         $this->loadModel('project');
diff --git a/module/testtask/model.php b/module/testtask/model.php
index 9be0847461..352e41bc1a 100755
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -789,6 +789,7 @@ class testtaskModel extends model
         $oldTask = $this->getById($taskID);
         $task = fixer::input('post')
             ->add('id', $taskID)
+            ->add('product', $oldTask->product)
             ->setDefault('type', '')
             ->setDefault('mailto', '')
             ->setDefault('deleteFiles', array())
@@ -807,11 +808,10 @@ class testtaskModel extends model
             ->where('id')->eq($taskID)
             ->exec();
 
-        if(!dao::isError())
-        {
-            $this->file->processFile4Object('testtask', $oldTask, $task);
-            return common::createChanges($oldTask, $task);
-        }
+        if(dao::isError()) return false;
+
+        $this->file->processFile4Object('testtask', $oldTask, $task);
+        return common::createChanges($oldTask, $task);
     }
 
     /**
diff --git a/module/testtask/ui/edit.html.php b/module/testtask/ui/edit.html.php
new file mode 100644
index 0000000000..b959120538
--- /dev/null
+++ b/module/testtask/ui/edit.html.php
@@ -0,0 +1,148 @@
+<?php
+declare(strict_types=1);
+/**
+ * The edit view file of testtask module of ZenTaoPMS.
+ * @copyright   Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.zentao.net)
+ * @license     ZPL(https://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
+ * @author      Tingting Dai <daitingting@easycorp.ltd>
+ * @package     testtask
+ * @link        https://www.zentao.net
+ */
+namespace zin;
+
+formPanel
+(
+    on::change('#execution', 'loadExecutionRelated'),
+    formGroup
+    (
+        set::width('1/2'),
+        set::label($lang->testtask->execution),
+        set::name('execution'),
+        set::value($task->execution),
+        set::class(((!empty($project) && !$project->multiple) || ($app->tab == 'execution' && $task->execution)) ? 'hidden' : ''),
+        set::control(array('type' => 'select', 'items' => $executions))
+    ),
+    formGroup
+    (
+        set::width('1/2'),
+        set::label($lang->testtask->build),
+        set::required(true),
+        set::name('build'),
+        set::value($task->build),
+        set::control(array('type' => 'select', 'items' => $builds))
+    ),
+    formGroup
+    (
+        set::width('1/2'),
+        set::label($lang->testtask->type),
+        set::name('type[]'),
+        set::value($task->type),
+        set::control(array('type' => 'select', 'items' => $lang->testtask->typeList, 'multiple' => true))
+    ),
+    formGroup
+    (
+        set::width('1/2'),
+        set::label($lang->testtask->owner),
+        set::name('owner'),
+        set::value($task->owner),
+        set::control(array('type' => 'select', 'items' => $users))
+    ),
+    formGroup
+    (
+        set::width('1/2'),
+        set::label($lang->testtask->begin),
+        set::required(true),
+        inputGroup
+        (
+            input
+            (
+                set::name('begin'),
+                set::type('date'),
+                set::required(true),
+                set::value($task->begin),
+                on::change('suitEndDate'),
+            ),
+            $lang->testtask->end,
+            input
+            (
+                set::name('end'),
+                set::type('date'),
+                set::required(true),
+                set::value($task->end),
+            )
+        )
+    ),
+    formGroup
+    (
+        set::width('1/2'),
+        set::label($lang->testtask->status),
+        set::name('status'),
+        set::required(true),
+        set::value($task->status),
+        set::control(array('type' => 'select', 'items' => $lang->testtask->statusList)),
+    ),
+    formGroup
+    (
+        set::width('1/2'),
+        set::label($lang->testtask->testreport),
+        set::name('testreport'),
+        set::value($task->testreport),
+        set::control(array('type' => 'select', 'items' => $testreports))
+    ),
+    formGroup
+    (
+        set::label($lang->testtask->name),
+        set::required(true),
+        inputGroup
+        (
+            input
+            (
+                set::name('name'),
+                set::required(true),
+                set::value($task->name),
+            ),
+            $lang->testtask->pri,
+            select
+            (
+                zui::width('80px'),
+                set::name('pri'),
+                set::items($lang->testtask->priList),
+                set::value($task->pri)
+            )
+        )
+    ),
+    formGroup
+    (
+        set::label($lang->testtask->desc),
+        editor
+        (
+            set::name('desc'),
+            set::rows(10),
+            set::value(htmlSpecialString($task->desc))
+        )
+    ),
+    formGroup
+    (
+        set::label($lang->comment),
+        editor
+        (
+            set::name('comment'),
+            set::rows(5),
+        )
+    ),
+    formGroup
+    (
+        set::label($lang->testtask->files),
+        set::name('files[]'),
+        set::control('file')
+    ),
+    formGroup
+    (
+        set::label($lang->testtask->mailto),
+        set::control(array('type' => 'select', 'items' => $users, 'multiple' => true)),
+        set::name('mailto[]'),
+        set::value(str_replace(' ', '', $task->mailto)),
+    )
+);
+
+render();