From a8cc7592a1d24fb3e76831c7ef845e0fa50ae09a Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Fri, 23 Jul 2021 16:13:07 +0800 Subject: [PATCH 1/2] * Fix project datatable details. --- module/project/view/browse.html.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/module/project/view/browse.html.php b/module/project/view/browse.html.php index 841168cc08..6d6e8a97e8 100644 --- a/module/project/view/browse.html.php +++ b/module/project/view/browse.html.php @@ -81,15 +81,16 @@ js::set('browseType', $browseType); recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"; - $datatableId = $this->moduleName . ucfirst($this->methodName); - $useDatatable = (isset($config->datatable->$datatableId->mode) and $config->datatable->$datatableId->mode == 'datatable'); - - if($useDatatable) include '../../common/view/datatable.html.php'; - $setting = $this->datatable->getSetting('project'); + $vars = "programID=$programID&browseType=$browseType¶m=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"; + $datatableId = $this->moduleName . ucfirst($this->methodName); + $useDatatable = (isset($config->datatable->$datatableId->mode) and $config->datatable->$datatableId->mode == 'datatable'); + $setting = $this->datatable->getSetting('project'); + $widths = $this->datatable->setFixedFieldWidth($setting); + + if($useDatatable) include '../../common/view/datatable.html.php'; ?> ';?> - '> +
' data-fixed-left-width='' data-fixed-right-width=''> config->systemMode == 'new' ? common::hasPriv('project', 'batchEdit') : common::hasPriv('project', 'batchEdit');?> From 6fab61854b2b5c797ba4413137edf42050066061 Mon Sep 17 00:00:00 2001 From: zenggang Date: Sat, 24 Jul 2021 23:07:22 +0800 Subject: [PATCH 2/2] * Finish task #40413 --- module/testcase/control.php | 2 +- test.txt | 0 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 test.txt diff --git a/module/testcase/control.php b/module/testcase/control.php index 8deb6933b0..5ed65aa4ed 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -1505,7 +1505,7 @@ class testcase extends control $this->post->set('kind', 'testcase'); $this->post->set('rows', $rows); $this->post->set('extraNum', $num); - $this->post->set('fileName', 'template'); + $this->post->set('fileName', 'Template'); $this->fetch('file', 'export2csv', $_POST); } diff --git a/test.txt b/test.txt new file mode 100644 index 0000000000..e69de29bb2