From 05e444d91d39cf2f874babe5388b4eb48954b680 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Fri, 13 Oct 2023 13:32:16 +0800 Subject: [PATCH] * Fix problems with form desc fields. --- module/build/config/form.php | 4 ++-- module/build/ui/edit.html.php | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/module/build/config/form.php b/module/build/config/form.php index 8462bc7450..5f1ba21b32 100644 --- a/module/build/config/form.php +++ b/module/build/config/form.php @@ -9,7 +9,7 @@ $config->build->form->create['artifactRepoID'] = array('type' => 'int', 'r $config->build->form->create['product'] = array('type' => 'int', 'required' => true, 'default' => 0); $config->build->form->create['scmPath'] = array('type' => 'string', 'required' => false, 'default' => ''); $config->build->form->create['filePath'] = array('type' => 'string', 'required' => false, 'default' => ''); -$config->build->form->create['desc'] = array('type' => 'string', 'required' => false, 'default' => ''); +$config->build->form->create['desc'] = array('type' => 'string', 'required' => false, 'default' => '', 'control' => 'editor'); $config->build->form->create['builder'] = array('type' => 'string', 'required' => true, 'default' => ''); $config->build->form->create['name'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim'); $config->build->form->create['branch'] = array('type' => 'array', 'required' => false, 'default' => array(), 'filter' => 'join'); @@ -24,7 +24,7 @@ $config->build->form->edit['execution'] = array('type' => 'int', 'required $config->build->form->edit['product'] = array('type' => 'int', 'required' => true, 'default' => 0); $config->build->form->edit['scmPath'] = array('type' => 'string', 'required' => false, 'default' => ''); $config->build->form->edit['filePath'] = array('type' => 'string', 'required' => false, 'default' => ''); -$config->build->form->edit['desc'] = array('type' => 'string', 'required' => false, 'default' => ''); +$config->build->form->edit['desc'] = array('type' => 'string', 'required' => false, 'default' => '', 'control' => 'editor'); $config->build->form->edit['builder'] = array('type' => 'string', 'required' => true, 'default' => ''); $config->build->form->edit['name'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim'); $config->build->form->edit['branch'] = array('type' => 'array', 'required' => false, 'default' => array(), 'filter' => 'join'); diff --git a/module/build/ui/edit.html.php b/module/build/ui/edit.html.php index 6b79ac8b51..cd2b297f92 100644 --- a/module/build/ui/edit.html.php +++ b/module/build/ui/edit.html.php @@ -182,8 +182,7 @@ formPanel editor ( set::name('desc'), - set::html($build->desc), - set::rows('10'), + html($build->desc), ) ), )