diff --git a/module/testsuite/config/table.php b/module/testsuite/config/table.php index cda8d3685c..f7b2ea4383 100644 --- a/module/testsuite/config/table.php +++ b/module/testsuite/config/table.php @@ -26,38 +26,44 @@ $config->testsuite->actionList['delete']['className'] = 'ajax-submit'; $config->testsuite->dtable = new stdclass(); -$config->testsuite->dtable->fieldList['id']['name'] = 'id'; -$config->testsuite->dtable->fieldList['id']['title'] = $lang->idAB; -$config->testsuite->dtable->fieldList['id']['type'] = 'ID'; -$config->testsuite->dtable->fieldList['id']['align'] = 'left'; -$config->testsuite->dtable->fieldList['id']['fixed'] = 'left'; +$config->testsuite->dtable->fieldList['id']['name'] = 'id'; +$config->testsuite->dtable->fieldList['id']['title'] = $lang->idAB; +$config->testsuite->dtable->fieldList['id']['type'] = 'ID'; +$config->testsuite->dtable->fieldList['id']['align'] = 'left'; +$config->testsuite->dtable->fieldList['id']['fixed'] = 'left'; +$config->testsuite->dtable->fieldList['id']['required'] = true; $config->testsuite->dtable->fieldList['name']['name'] = 'name'; $config->testsuite->dtable->fieldList['name']['title'] = $lang->testsuite->name; $config->testsuite->dtable->fieldList['name']['type'] = 'title'; $config->testsuite->dtable->fieldList['name']['minWidth'] = '200'; $config->testsuite->dtable->fieldList['name']['fixed'] = 'left'; +$config->testsuite->dtable->fieldList['name']['show'] = true; $config->testsuite->dtable->fieldList['desc']['name'] = 'desc'; $config->testsuite->dtable->fieldList['desc']['title'] = $lang->testsuite->desc; $config->testsuite->dtable->fieldList['desc']['type'] = 'html'; +$config->testsuite->dtable->fieldList['desc']['show'] = true; $config->testsuite->dtable->fieldList['addedBy']['name'] = 'addedBy'; $config->testsuite->dtable->fieldList['addedBy']['title'] = $lang->testsuite->addedBy; $config->testsuite->dtable->fieldList['addedBy']['type'] = 'user'; $config->testsuite->dtable->fieldList['addedBy']['sortType'] = true; $config->testsuite->dtable->fieldList['addedBy']['align'] = 'left'; +$config->testsuite->dtable->fieldList['addedBy']['show'] = true; $config->testsuite->dtable->fieldList['addedDate']['name'] = 'addedDate'; $config->testsuite->dtable->fieldList['addedDate']['title'] = $lang->testsuite->addedDate; $config->testsuite->dtable->fieldList['addedDate']['type'] = 'datetime'; $config->testsuite->dtable->fieldList['addedDate']['sortType'] = true; +$config->testsuite->dtable->fieldList['addedDate']['show'] = true; $config->testsuite->dtable->fieldList['actions']['name'] = 'actions'; $config->testsuite->dtable->fieldList['actions']['title'] = $lang->actions; $config->testsuite->dtable->fieldList['actions']['type'] = 'actions'; $config->testsuite->dtable->fieldList['actions']['fixed'] = 'right'; $config->testsuite->dtable->fieldList['actions']['sortType'] = false; +$config->testsuite->dtable->fieldList['actions']['width'] = '80px'; $config->testsuite->dtable->fieldList['actions']['list'] = $config->testsuite->actionList; $config->testsuite->dtable->fieldList['actions']['menu'] = array('linkCase', 'edit', 'delete'); diff --git a/module/testsuite/ui/browse.html.php b/module/testsuite/ui/browse.html.php index eafb8266a3..be809b1c20 100644 --- a/module/testsuite/ui/browse.html.php +++ b/module/testsuite/ui/browse.html.php @@ -17,7 +17,7 @@ $config->testsuite->dtable->fieldList['addedBy']['userMap'] = $users; $tableData = initTableData($suites, $config->testsuite->dtable->fieldList, $this->testsuite); foreach($tableData as $testsuite) $testsuite->desc = strip_tags($testsuite->desc); -$cols = array_values($config->testsuite->dtable->fieldList); +$cols = $this->loadModel('datatable')->getSetting('testsuite'); $data = array_values($tableData); featureBar @@ -47,6 +47,7 @@ dtable set::cols($cols), set::data($data), set::orderBy($orderBy), + set::customCols(true), set::sortLink(createLink('testsuite', 'browse', "productID={$product->id}&type={$type}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")), set::fixedLeftWidth('0.33'), set::onRenderCell(jsRaw('window.renderCell')),