From 3cbfb56c63df449bbeacb4a8bcedb6ec11431ccc Mon Sep 17 00:00:00 2001 From: zenggang Date: Wed, 30 Aug 2023 07:10:52 +0000 Subject: [PATCH] * Fix bug#37843 --- module/job/ui/edit.html.php | 1 + module/repo/lang/de.php | 1 + module/repo/lang/en.php | 1 + module/repo/lang/fr.php | 1 + module/repo/lang/zh-cn.php | 1 + module/repo/ui/create.html.php | 14 ++++++++------ module/repo/ui/edit.html.php | 18 +++++++++--------- 7 files changed, 22 insertions(+), 15 deletions(-) diff --git a/module/job/ui/edit.html.php b/module/job/ui/edit.html.php index a1e93e5620..344fb1f38a 100644 --- a/module/job/ui/edit.html.php +++ b/module/job/ui/edit.html.php @@ -119,6 +119,7 @@ formPanel formGroup ( set::label($lang->job->engine), + set::name('engine'), set::control('static'), set::value(zget($lang->job->engineList, $job->engine, '')), ), diff --git a/module/repo/lang/de.php b/module/repo/lang/de.php index e928fa48aa..e9d3abd583 100644 --- a/module/repo/lang/de.php +++ b/module/repo/lang/de.php @@ -32,6 +32,7 @@ $lang->repo->blameTmpl = 'Code for line %line: %name comm $lang->repo->notRelated = 'There is currently no related ZenTao object'; $lang->repo->source = 'Criterion'; $lang->repo->target = 'Contrast'; +$lang->repo->descPlaceholder = 'One sentence description'; $lang->repo->browseAction = 'Browse Repo'; $lang->repo->createAction = 'Create Repo'; diff --git a/module/repo/lang/en.php b/module/repo/lang/en.php index 56af4d95d4..e7723fc66f 100644 --- a/module/repo/lang/en.php +++ b/module/repo/lang/en.php @@ -32,6 +32,7 @@ $lang->repo->blameTmpl = 'Code for line %line: %name comm $lang->repo->notRelated = 'There is currently no related ZenTao object'; $lang->repo->source = 'Criterion'; $lang->repo->target = 'Contrast'; +$lang->repo->descPlaceholder = 'One sentence description'; $lang->repo->browseAction = 'Browse Repo'; $lang->repo->createAction = 'Create Repo'; diff --git a/module/repo/lang/fr.php b/module/repo/lang/fr.php index 9d248e814f..b4c1cb5f3b 100644 --- a/module/repo/lang/fr.php +++ b/module/repo/lang/fr.php @@ -32,6 +32,7 @@ $lang->repo->blameTmpl = 'Code for line %line: %name comm $lang->repo->notRelated = 'There is currently no related ZenTao object'; $lang->repo->source = 'Criterion'; $lang->repo->target = 'Contrast'; +$lang->repo->descPlaceholder = 'One sentence description'; $lang->repo->browseAction = 'Browse Repo'; $lang->repo->createAction = 'Créer Ref'; diff --git a/module/repo/lang/zh-cn.php b/module/repo/lang/zh-cn.php index 9fc9d14c72..8da890c74a 100644 --- a/module/repo/lang/zh-cn.php +++ b/module/repo/lang/zh-cn.php @@ -32,6 +32,7 @@ $lang->repo->blameTmpl = '第 %line 行代码相关信息 $lang->repo->notRelated = '暂时没有关联禅道对象'; $lang->repo->source = '基准'; $lang->repo->target = '对比'; +$lang->repo->descPlaceholder = '一句话描述'; $lang->repo->browseAction = '浏览代码库'; $lang->repo->createAction = '添加代码库'; diff --git a/module/repo/ui/create.html.php b/module/repo/ui/create.html.php index 8c8b29f924..5d843ba72c 100644 --- a/module/repo/ui/create.html.php +++ b/module/repo/ui/create.html.php @@ -175,6 +175,14 @@ formPanel ) ) ), + formGroup + ( + set::width('1/2'), + set::name("desc"), + set::label($lang->story->spec), + set::control("input"), + set::placeholder($lang->repo->descPlaceholder), + ), formRow ( set::id('aclList'), @@ -226,12 +234,6 @@ formPanel ) ), ), - formGroup - ( - set::name("desc"), - set::label($lang->story->spec), - set::control("editor") - ) ); render(); diff --git a/module/repo/ui/edit.html.php b/module/repo/ui/edit.html.php index e9326704da..171ed1bed4 100644 --- a/module/repo/ui/edit.html.php +++ b/module/repo/ui/edit.html.php @@ -175,6 +175,15 @@ formPanel ) ) ), + formGroup + ( + set::width('1/2'), + set::name("desc"), + set::label($lang->story->spec), + set::control("input"), + set::placeholder($lang->repo->descPlaceholder), + set::value(strip_tags($repo->desc)), + ), formRow ( set::id('aclList'), @@ -226,15 +235,6 @@ formPanel ) ), ), - formGroup - ( - set::label($lang->story->spec), - editor - ( - set::name("desc"), - html($repo->desc), - ) - ) ); render();