From 92c323d600592e787ca9192db1cf5ef425902fc5 Mon Sep 17 00:00:00 2001 From: zhouxudong Date: Fri, 15 Jul 2022 05:14:48 +0000 Subject: [PATCH 01/88] * Finish task #60388. --- module/file/control.php | 6 +- module/file/view/edit.html.php | 62 --------------------- module/file/view/viewfiles.html.php | 86 +++++++++++++++++++++++++++-- 3 files changed, 82 insertions(+), 72 deletions(-) delete mode 100644 module/file/view/edit.html.php diff --git a/module/file/control.php b/module/file/control.php index 5320c04355..aee24d9940 100644 --- a/module/file/control.php +++ b/module/file/control.php @@ -341,12 +341,10 @@ class file extends control /* Update test case version for test case synchronization. */ if($file->objectType == 'testcase' and $file->title != $fileName) $this->file->updateTestcaseVersion($file); + $newFile = $this->file->getByID($fileID); - return print(js::reload('parent.parent')); + echo json_encode($newFile); } - - $this->view->file = $this->file->getById($fileID); - $this->display(); } /** diff --git a/module/file/view/edit.html.php b/module/file/view/edit.html.php deleted file mode 100644 index 1329925822..0000000000 --- a/module/file/view/edit.html.php +++ /dev/null @@ -1,62 +0,0 @@ - - * @package file - * @version $Id$ - * @link http://www.zentao.net - */ -?> - - - -
-
-
-
-

file->inputFileName;?>

-
- title, '.') !== false) - { - /* Fix the file name exe.exe */ - $title = explode('.', $file->title); - $extension = end($title); - if($file->extension == 'txt' && $extension != $file->extension) $file->extension = $extension; - array_pop($title); - $file->title = join('.', $title); - } - ?> -
- - - - - -
-
- title, "class='form-control' size='40'");?> - - .extension;?> -
-
-
-
-
-
- diff --git a/module/file/view/viewfiles.html.php b/module/file/view/viewfiles.html.php index 15990a8c8e..bf324363a7 100644 --- a/module/file/view/viewfiles.html.php +++ b/module/file/view/viewfiles.html.php @@ -9,6 +9,10 @@ .files-list>li>a {display: inline; word-wrap: break-word;} .files-list>li>.right-icon {opacity: 1;} .fileAction {color: #0c64eb !important;} + .renameFile {display: flex;} + .renameFile .input-group {margin-left: 10px;} + .renameFile .icon {margin-top: 8px;} + .renameFile .input-group-addon {width: 60px;} From 7c506f9bd78cae842c8c020c0be3dbc644e9000c Mon Sep 17 00:00:00 2001 From: zhouxudong Date: Wed, 27 Jul 2022 05:23:34 +0000 Subject: [PATCH 02/88] * Finish task #60388. --- module/file/view/viewfiles.html.php | 54 ++++++++++++----------------- 1 file changed, 23 insertions(+), 31 deletions(-) diff --git a/module/file/view/viewfiles.html.php b/module/file/view/viewfiles.html.php index bf324363a7..cc4726c10b 100644 --- a/module/file/view/viewfiles.html.php +++ b/module/file/view/viewfiles.html.php @@ -166,37 +166,29 @@
  • - title, '.') !== false) - { - /* Fix the file name exe.exe */ - $title = explode('.', $file->title); - $extension = end($title); - if($file->extension == 'txt' && $extension != $file->extension) $file->extension = $extension; - array_pop($title); - $file->title = join('.', $title); - } - ?> - + title, '.') !== false) + { + /* Fix the file name exe.exe */ + $title = explode('.', $file->title); + $extension = end($title); + if($file->extension == 'txt' && $extension != $file->extension) $file->extension = $extension; + array_pop($title); + $file->title = join('.', $title); + } + ?> +
    • From d505caff818658b1613aadd2542c8c576ee5ea0d Mon Sep 17 00:00:00 2001 From: zhouxudong Date: Thu, 28 Jul 2022 01:32:22 +0000 Subject: [PATCH 03/88] * Finish task #60388. --- module/file/view/viewfiles.html.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/module/file/view/viewfiles.html.php b/module/file/view/viewfiles.html.php index cc4726c10b..ce87f3bae2 100644 --- a/module/file/view/viewfiles.html.php +++ b/module/file/view/viewfiles.html.php @@ -6,6 +6,7 @@
    getExtViewFile(__FILE__)){include $extView; return helper::cd();}?> From dc14d91320839d18b049b9dfb9c1096fa842759a Mon Sep 17 00:00:00 2001 From: wangyuting2 <851424971@qq.com> Date: Tue, 2 Aug 2022 14:54:20 +0800 Subject: [PATCH 14/88] * Finish task #63286. --- module/build/lang/de.php | 3 +++ module/build/lang/en.php | 3 +++ module/build/lang/fr.php | 3 +++ module/build/lang/vi.php | 3 +++ module/build/lang/zh-cn.php | 3 +++ module/caselib/lang/de.php | 4 ++++ module/caselib/lang/en.php | 4 ++++ module/caselib/lang/fr.php | 4 ++++ module/caselib/lang/vi.php | 4 ++++ module/caselib/lang/zh-cn.php | 4 ++++ module/caselib/view/browse.html.php | 7 ++++--- module/execution/view/build.html.php | 9 +++------ module/project/view/build.html.php | 9 +++------ module/release/lang/de.php | 5 +++++ module/release/lang/en.php | 5 +++++ module/release/lang/fr.php | 5 +++++ module/release/lang/vi.php | 5 +++++ module/release/lang/zh-cn.php | 5 +++++ module/release/view/browse.html.php | 11 ++++++----- module/testsuite/lang/de.php | 3 +++ module/testsuite/lang/en.php | 3 +++ module/testsuite/lang/fr.php | 3 +++ module/testsuite/lang/vi.php | 3 +++ module/testsuite/lang/zh-cn.php | 3 +++ module/testsuite/view/browse.html.php | 12 ++++++++---- 25 files changed, 99 insertions(+), 24 deletions(-) diff --git a/module/build/lang/de.php b/module/build/lang/de.php index 9ffa1dfda4..713a3f7a70 100644 --- a/module/build/lang/de.php +++ b/module/build/lang/de.php @@ -68,3 +68,6 @@ $lang->build->action = new stdclass(); $lang->build->action->buildopened = '$date, erstellt von $actor, Build $extra.' . "\n"; $lang->backhome = 'zurück'; + +$lang->build->featureBar = array(); +$lang->build->featureBar['all'] = 'Build List'; diff --git a/module/build/lang/en.php b/module/build/lang/en.php index 79cd2f6480..0f4697bc00 100644 --- a/module/build/lang/en.php +++ b/module/build/lang/en.php @@ -68,3 +68,6 @@ $lang->build->action = new stdclass(); $lang->build->action->buildopened = '$date, created by $actor, Build $extra.' . "\n"; $lang->backhome = 'back'; + +$lang->build->featureBar = array(); +$lang->build->featureBar['all'] = 'Build List'; diff --git a/module/build/lang/fr.php b/module/build/lang/fr.php index cbf8cc4469..e253bb8bff 100644 --- a/module/build/lang/fr.php +++ b/module/build/lang/fr.php @@ -68,3 +68,6 @@ $lang->build->action = new stdclass(); $lang->build->action->buildopened = '$date, Build $extra créé par $actor.' . "\n"; $lang->backhome = 'Retour'; + +$lang->build->featureBar = array(); +$lang->build->featureBar['all'] = 'Build List'; diff --git a/module/build/lang/vi.php b/module/build/lang/vi.php index adf75db272..2944d33052 100644 --- a/module/build/lang/vi.php +++ b/module/build/lang/vi.php @@ -64,3 +64,6 @@ $lang->build->action = new stdclass(); $lang->build->action->buildopened = '$date, được tạo bởi $actor, Bản dựng $extra.' . "\n"; $lang->backhome = 'Trở lại'; + +$lang->build->featureBar = array(); +$lang->build->featureBar['all'] = 'Build List'; diff --git a/module/build/lang/zh-cn.php b/module/build/lang/zh-cn.php index c45863af1a..e57c4cb987 100644 --- a/module/build/lang/zh-cn.php +++ b/module/build/lang/zh-cn.php @@ -68,3 +68,6 @@ $lang->build->action = new stdclass(); $lang->build->action->buildopened = '$date, 由 $actor 创建版本 $extra。' . "\n"; $lang->backhome = '返回'; + +$lang->build->featureBar = array(); +$lang->build->featureBar['all'] = '所有版本'; diff --git a/module/caselib/lang/de.php b/module/caselib/lang/de.php index 652875e151..35d8c672df 100644 --- a/module/caselib/lang/de.php +++ b/module/caselib/lang/de.php @@ -44,3 +44,7 @@ $lang->caselib->legendDesc = 'Description'; $lang->caselib->libraryDelete = 'Do you want to delete this library？'; $lang->caselib->noModule = '
    You have no modules.
    Manage it now.
    '; + +$lang->caselib->featureBar = array(); +$lang->caselib->featureBar['all'] = 'All'; +$lang->caselib->featureBar['wait'] = 'Waiting'; diff --git a/module/caselib/lang/en.php b/module/caselib/lang/en.php index 652875e151..35d8c672df 100644 --- a/module/caselib/lang/en.php +++ b/module/caselib/lang/en.php @@ -44,3 +44,7 @@ $lang->caselib->legendDesc = 'Description'; $lang->caselib->libraryDelete = 'Do you want to delete this library？'; $lang->caselib->noModule = '
    You have no modules.
    Manage it now.
    '; + +$lang->caselib->featureBar = array(); +$lang->caselib->featureBar['all'] = 'All'; +$lang->caselib->featureBar['wait'] = 'Waiting'; diff --git a/module/caselib/lang/fr.php b/module/caselib/lang/fr.php index 9f02e7f2e9..541ce5fc56 100644 --- a/module/caselib/lang/fr.php +++ b/module/caselib/lang/fr.php @@ -44,3 +44,7 @@ $lang->caselib->legendDesc = 'Description'; $lang->caselib->libraryDelete = 'Voulez vous supprimer cette library ？'; $lang->caselib->noModule = "
    Vous n'avez aucun modules.
    Gérer les modules maintenant.
    "; + +$lang->caselib->featureBar = array(); +$lang->caselib->featureBar['all'] = 'All'; +$lang->caselib->featureBar['wait'] = 'Waiting'; diff --git a/module/caselib/lang/vi.php b/module/caselib/lang/vi.php index 48202a34e2..60ad1d452b 100644 --- a/module/caselib/lang/vi.php +++ b/module/caselib/lang/vi.php @@ -39,3 +39,7 @@ $lang->caselib->legendDesc = 'Mô tả'; $lang->caselib->libraryDelete = 'Bạn có muốn xóa thư viện này?'; $lang->caselib->noModule = '
    Chưa có Module.
    Quản lý ngay.
    '; + +$lang->caselib->featureBar = array(); +$lang->caselib->featureBar['all'] = 'All'; +$lang->caselib->featureBar['wait'] = 'Waiting'; diff --git a/module/caselib/lang/zh-cn.php b/module/caselib/lang/zh-cn.php index e54c946d4e..3c1289b04c 100644 --- a/module/caselib/lang/zh-cn.php +++ b/module/caselib/lang/zh-cn.php @@ -44,3 +44,7 @@ $lang->caselib->legendDesc = '描述'; $lang->caselib->libraryDelete = '您确认要删除该用例库吗？'; $lang->caselib->noModule = '
    您现在还没有模块信息
    请维护用例库模块
    '; + +$lang->caselib->featureBar = array(); +$lang->caselib->featureBar['all'] = '所有'; +$lang->caselib->featureBar['wait'] = '待评审'; diff --git a/module/caselib/view/browse.html.php b/module/caselib/view/browse.html.php index 20a7880ebc..9e4acd32df 100644 --- a/module/caselib/view/browse.html.php +++ b/module/caselib/view/browse.html.php @@ -40,10 +40,11 @@ js::set('flow', $config->global->flow);
    testcase->needReview && empty($config->testcase->forceReview)) unset($lang->caselib->featureBar['wait']); + foreach($lang->caselib->featureBar as $featureType => $label) { - echo html::a($this->inlink('browse', "libID=$libID&browseType=all"), "{$lang->testcase->allCases}", '', "id='allTab' class='btn btn-link'"); - if($config->testcase->needReview or !empty($config->testcase->forceReview)) echo html::a($this->inlink('browse', "libID=$libID&browseType=wait"), "" . $lang->testcase->statusList['wait'] . "", '', "id='waitTab' class='btn btn-link'"); + $activeClass = $browseType == $featureType ? 'btn-active-text' : ''; + echo html::a(inlink('browse', "libID=$libID&browseType=$featureType"), "$label", '',"class='btn btn-link $activeClass' data-app={$app->tab} id=" . $featureType .'Tab'); } ?> testcase->bySearch;?> diff --git a/module/execution/view/build.html.php b/module/execution/view/build.html.php index b8287370df..534da300f0 100644 --- a/module/execution/view/build.html.php +++ b/module/execution/view/build.html.php @@ -16,14 +16,11 @@