From a473462d6fb4a952f72db6e016a9d4711223e410 Mon Sep 17 00:00:00 2001 From: sunhao Date: Tue, 6 Feb 2024 18:31:17 +0800 Subject: [PATCH] * refactor all upload with fileSelector. --- extension/lite/story/ext/ui/create.html.php | 2 +- extension/lite/story/ext/ui/edit.html.php | 2 +- module/bug/ui/activate.html.php | 2 +- module/bug/ui/edit.html.php | 2 +- module/bug/ui/resolve.html.php | 2 +- module/build/ui/edit.html.php | 2 +- module/caselib/ui/createcase.html.php | 2 +- module/design/ui/create.html.php | 2 +- module/design/ui/edit.html.php | 2 +- module/doc/ui/create.html.php | 2 +- module/doc/ui/edit.html.php | 2 +- module/extension/ui/upload.html.php | 2 +- module/release/ui/create.html.php | 2 +- module/release/ui/edit.html.php | 2 +- module/story/ui/change.html.php | 2 +- module/story/ui/edit.html.php | 2 +- module/task/ui/edit.html.php | 2 +- module/task/ui/finish.html.php | 2 +- module/testcase/ui/edit.html.php | 4 ++-- module/testreport/ui/create.html.php | 2 +- module/testreport/ui/edit.html.php | 2 +- module/testtask/ui/create.html.php | 2 +- module/testtask/ui/edit.html.php | 2 +- module/testtask/ui/importunitresult.html.php | 2 +- module/testtask/ui/runcase.html.php | 3 +-- 25 files changed, 26 insertions(+), 27 deletions(-) diff --git a/extension/lite/story/ext/ui/create.html.php b/extension/lite/story/ext/ui/create.html.php index e036980a87..19a6536438 100644 --- a/extension/lite/story/ext/ui/create.html.php +++ b/extension/lite/story/ext/ui/create.html.php @@ -171,7 +171,7 @@ formPanel formGroup ( set::label($lang->story->legendAttach), - upload() + fileSelector() ), formGroup ( diff --git a/extension/lite/story/ext/ui/edit.html.php b/extension/lite/story/ext/ui/edit.html.php index f3e079a643..88aabf5750 100644 --- a/extension/lite/story/ext/ui/edit.html.php +++ b/extension/lite/story/ext/ui/edit.html.php @@ -151,7 +151,7 @@ detailBody $canEditContent || $story->files ? section ( set::title($lang->story->legendAttach), - $canEditContent ? upload() : null, + $canEditContent ? fileSelector() : null, $story->files ? fileList ( set::files($story->files), diff --git a/module/bug/ui/activate.html.php b/module/bug/ui/activate.html.php index 189422cee9..980019fe28 100644 --- a/module/bug/ui/activate.html.php +++ b/module/bug/ui/activate.html.php @@ -56,7 +56,7 @@ formPanel formGroup ( set::label($lang->bug->files), - upload() + fileSelector() ) ); hr(); diff --git a/module/bug/ui/edit.html.php b/module/bug/ui/edit.html.php index e5dcace810..6e11a82684 100644 --- a/module/bug/ui/edit.html.php +++ b/module/bug/ui/edit.html.php @@ -98,7 +98,7 @@ detailBody section ( set::title($lang->files), - upload() + fileSelector() ), section ( diff --git a/module/bug/ui/resolve.html.php b/module/bug/ui/resolve.html.php index 59307a1182..14335bc29e 100644 --- a/module/bug/ui/resolve.html.php +++ b/module/bug/ui/resolve.html.php @@ -138,7 +138,7 @@ formPanel formGroup ( set::label($lang->bug->files), - upload() + fileSelector() ), formGroup ( diff --git a/module/build/ui/edit.html.php b/module/build/ui/edit.html.php index 24b2a6f3d8..42e82e1eb3 100644 --- a/module/build/ui/edit.html.php +++ b/module/build/ui/edit.html.php @@ -172,7 +172,7 @@ formPanel formGroup ( set::label($lang->build->files), - upload() + fileSelector() ) ), formRow diff --git a/module/caselib/ui/createcase.html.php b/module/caselib/ui/createcase.html.php index 862f47ba38..7ea7de077a 100644 --- a/module/caselib/ui/createcase.html.php +++ b/module/caselib/ui/createcase.html.php @@ -167,7 +167,7 @@ formPanel formGroup ( set::label($lang->testcase->files), - upload() + fileSelector() ) ) ); diff --git a/module/design/ui/create.html.php b/module/design/ui/create.html.php index 7d810a6b43..8640081376 100644 --- a/module/design/ui/create.html.php +++ b/module/design/ui/create.html.php @@ -84,7 +84,7 @@ formPanel formGroup ( set::label($lang->design->file), - upload() + fileSelector() ) ) ); diff --git a/module/design/ui/edit.html.php b/module/design/ui/edit.html.php index c97f99403a..61ab59d6cc 100644 --- a/module/design/ui/edit.html.php +++ b/module/design/ui/edit.html.php @@ -76,7 +76,7 @@ formPanel formGroup ( set::label($lang->design->file), - upload() + fileSelector() ), formGroup ( diff --git a/module/doc/ui/create.html.php b/module/doc/ui/create.html.php index 7ae3d46545..0fa486bd09 100644 --- a/module/doc/ui/create.html.php +++ b/module/doc/ui/create.html.php @@ -196,7 +196,7 @@ else formGroup ( set::label($lang->doc->files), - upload() + fileSelector() ), formGroup ( diff --git a/module/doc/ui/edit.html.php b/module/doc/ui/edit.html.php index 366e9f53b4..e2999a2e41 100644 --- a/module/doc/ui/edit.html.php +++ b/module/doc/ui/edit.html.php @@ -132,7 +132,7 @@ form formGroup ( set::label($lang->doc->files), - upload() + fileSelector() ), formGroup ( diff --git a/module/extension/ui/upload.html.php b/module/extension/ui/upload.html.php index 6bd39a22ca..2f4a48a94e 100755 --- a/module/extension/ui/upload.html.php +++ b/module/extension/ui/upload.html.php @@ -37,7 +37,7 @@ else ( formGroup ( - upload + fileSelector ( set::multiple(false), set::limitSize($maxUploadSize . 'B'), diff --git a/module/release/ui/create.html.php b/module/release/ui/create.html.php index 81329509fb..f31b4a5d2a 100644 --- a/module/release/ui/create.html.php +++ b/module/release/ui/create.html.php @@ -108,7 +108,7 @@ formPanel formGroup ( set::label($lang->release->files), - upload(set::name('releaseFiles[]')) + fileSelector(set::name('releaseFiles[]')) ) ); diff --git a/module/release/ui/edit.html.php b/module/release/ui/edit.html.php index da43d4ba32..7326bebc61 100644 --- a/module/release/ui/edit.html.php +++ b/module/release/ui/edit.html.php @@ -92,7 +92,7 @@ formPanel formGroup ( set::label($lang->release->files), - upload() + fileSelector() ), formHidden('product', $release->product) ); diff --git a/module/story/ui/change.html.php b/module/story/ui/change.html.php index ef91b57e78..1b26e425d2 100644 --- a/module/story/ui/change.html.php +++ b/module/story/ui/change.html.php @@ -174,7 +174,7 @@ $formItems['file'] = formGroup set::fieldset(false), set::object($story) ) : null, - upload() + fileSelector() ); if($this->config->vision != 'or') $formItems['affected'] = $getAffectedTabs($story, $users); diff --git a/module/story/ui/edit.html.php b/module/story/ui/edit.html.php index 5e96c8be21..94bb738c34 100644 --- a/module/story/ui/edit.html.php +++ b/module/story/ui/edit.html.php @@ -173,7 +173,7 @@ detailBody $canEditContent || $story->files ? section ( set::title($lang->story->legendAttach), - $canEditContent ? upload() : null, + $canEditContent ? fileSelector() : null, $story->files ? fileList ( set::files($story->files), diff --git a/module/task/ui/edit.html.php b/module/task/ui/edit.html.php index 4c06eafd75..0f3ea752fd 100644 --- a/module/task/ui/edit.html.php +++ b/module/task/ui/edit.html.php @@ -134,7 +134,7 @@ detailBody section ( set::title($lang->files), - upload() + fileSelector() ), formHidden('lastEditedDate', helper::isZeroDate($task->lastEditedDate) ? '' : $task->lastEditedDate) ), diff --git a/module/task/ui/finish.html.php b/module/task/ui/finish.html.php index 67f7b8d996..bfafdd0896 100644 --- a/module/task/ui/finish.html.php +++ b/module/task/ui/finish.html.php @@ -164,7 +164,7 @@ else formGroup ( set::label($lang->story->files), - upload() + fileSelector() ), formGroup ( diff --git a/module/testcase/ui/edit.html.php b/module/testcase/ui/edit.html.php index dfaca78542..21680d9a5c 100644 --- a/module/testcase/ui/edit.html.php +++ b/module/testcase/ui/edit.html.php @@ -143,7 +143,7 @@ detailBody set::showEdit(true), set::showDelete(true) ) : null, - upload() + fileSelector() ), section ( @@ -257,7 +257,7 @@ detailBody ( $case->auto == 'auto' ? set::trClass('autoScript') : set::trClass('hidden autoScript'), set::name($lang->testcase->autoScript), - upload + fileSelector ( set::name('scriptFile'), set::accept($config->testcase->scriptAcceptFileTypes), diff --git a/module/testreport/ui/create.html.php b/module/testreport/ui/create.html.php index 202a077d80..6f5633572c 100644 --- a/module/testreport/ui/create.html.php +++ b/module/testreport/ui/create.html.php @@ -485,7 +485,7 @@ panel formGroup ( set::label($lang->files), - upload() + fileSelector() ) ) ), diff --git a/module/testreport/ui/edit.html.php b/module/testreport/ui/edit.html.php index 329684529f..a25e0dc0af 100644 --- a/module/testreport/ui/edit.html.php +++ b/module/testreport/ui/edit.html.php @@ -466,7 +466,7 @@ panel set::files($report->files), set::fieldset(false) ) : null, - upload() + fileSelector() ) ) ), diff --git a/module/testtask/ui/create.html.php b/module/testtask/ui/create.html.php index 58a9d058c5..ca6175c42a 100644 --- a/module/testtask/ui/create.html.php +++ b/module/testtask/ui/create.html.php @@ -190,7 +190,7 @@ formPanel formGroup ( set::label($lang->testtask->files), - upload() + fileSelector() ), formGroup ( diff --git a/module/testtask/ui/edit.html.php b/module/testtask/ui/edit.html.php index 16ecb6dd2c..03b278f295 100644 --- a/module/testtask/ui/edit.html.php +++ b/module/testtask/ui/edit.html.php @@ -158,7 +158,7 @@ formPanel formGroup ( set::label($lang->testtask->files), - upload() + fileSelector() ), formGroup ( diff --git a/module/testtask/ui/importunitresult.html.php b/module/testtask/ui/importunitresult.html.php index 925dc019c8..79a32921f5 100644 --- a/module/testtask/ui/importunitresult.html.php +++ b/module/testtask/ui/importunitresult.html.php @@ -96,7 +96,7 @@ formPanel set::label($lang->testtask->resultFile), set::width('1/2'), set::required(true), - upload + fileSelector ( set::name('resultFile'), set::multiple(false), diff --git a/module/testtask/ui/runcase.html.php b/module/testtask/ui/runcase.html.php index 1cbbc0d316..c18111ad35 100644 --- a/module/testtask/ui/runcase.html.php +++ b/module/testtask/ui/runcase.html.php @@ -129,7 +129,7 @@ if($confirm != 'yes') set::id("fileModal{$step->id}"), set::title($lang->testtask->files), setData('position', 'center'), - upload + fileSelector ( set::name("files{$step->id}[]") ), @@ -267,4 +267,3 @@ div set::id('runCaseModal'); render(); -