diff --git a/module/execution/config/dtable.php b/module/execution/config/dtable.php index 0a0b75fa4f..d34f8ead24 100644 --- a/module/execution/config/dtable.php +++ b/module/execution/config/dtable.php @@ -316,20 +316,21 @@ $config->execution->testtask->dtable->fieldList['product']['name'] = 'productNa $config->execution->testtask->dtable->fieldList['product']['title'] = $lang->testtask->product; $config->execution->testtask->dtable->fieldList['product']['type'] = 'text'; $config->execution->testtask->dtable->fieldList['product']['group'] = '1'; +$config->execution->testtask->dtable->fieldList['product']['fixed'] = 'left'; $config->execution->testtask->dtable->fieldList['id']['name'] = 'id'; $config->execution->testtask->dtable->fieldList['id']['title'] = $lang->idAB; $config->execution->testtask->dtable->fieldList['id']['type'] = 'checkID'; $config->execution->testtask->dtable->fieldList['id']['checkbox'] = true; $config->execution->testtask->dtable->fieldList['id']['group'] = '2'; -$config->execution->testtask->dtable->fieldList['id']['fixed'] = false; +$config->execution->testtask->dtable->fieldList['id']['fixed'] = 'left'; $config->execution->testtask->dtable->fieldList['title']['name'] = 'name'; $config->execution->testtask->dtable->fieldList['title']['title'] = $lang->testtask->name; $config->execution->testtask->dtable->fieldList['title']['type'] = 'title'; $config->execution->testtask->dtable->fieldList['title']['link'] = array('module' => 'testtask', 'method' => 'cases', 'params' => 'taskID={id}'); $config->execution->testtask->dtable->fieldList['title']['group'] = '2'; -$config->execution->testtask->dtable->fieldList['title']['fixed'] = false; +$config->execution->testtask->dtable->fieldList['title']['fixed'] = 'left'; $config->execution->testtask->dtable->fieldList['title']['width'] = '356'; $config->execution->testtask->dtable->fieldList['title']['data-app'] = 'execution'; @@ -370,6 +371,6 @@ $config->execution->testtask->dtable->fieldList['actions']['name'] = 'action $config->execution->testtask->dtable->fieldList['actions']['title'] = $lang->actions; $config->execution->testtask->dtable->fieldList['actions']['type'] = 'actions'; $config->execution->testtask->dtable->fieldList['actions']['sortType'] = false; -$config->execution->testtask->dtable->fieldList['actions']['fixed'] = false; +$config->execution->testtask->dtable->fieldList['actions']['fixed'] = 'right'; $config->execution->testtask->dtable->fieldList['actions']['list'] = $config->execution->testtaskActionList; -$config->execution->testtask->dtable->fieldList['actions']['menu'] = array('cases', 'linkCase', 'report', 'view', 'edit', 'delete'); +$config->execution->testtask->dtable->fieldList['actions']['menu'] = array(array('start', 'other' => array('activate', 'close')), 'cases', 'linkCase', 'report', 'view', 'edit', 'delete'); diff --git a/module/project/config/dtable.php b/module/project/config/dtable.php index 9b405f2c79..a50eff4b17 100755 --- a/module/project/config/dtable.php +++ b/module/project/config/dtable.php @@ -444,20 +444,21 @@ $config->project->dtable->testtask->fieldList['product']['name'] = 'productName $config->project->dtable->testtask->fieldList['product']['title'] = $lang->testtask->product; $config->project->dtable->testtask->fieldList['product']['type'] = 'text'; $config->project->dtable->testtask->fieldList['product']['group'] = '1'; +$config->project->dtable->testtask->fieldList['product']['fixed'] = 'left'; $config->project->dtable->testtask->fieldList['id']['name'] = 'idName'; $config->project->dtable->testtask->fieldList['id']['title'] = $lang->idAB; -$config->project->dtable->testtask->fieldList['id']['type'] = 'id'; +$config->project->dtable->testtask->fieldList['id']['type'] = 'checkID'; $config->project->dtable->testtask->fieldList['id']['checkbox'] = true; $config->project->dtable->testtask->fieldList['id']['group'] = '2'; -$config->project->dtable->testtask->fieldList['id']['fixed'] = false; +$config->project->dtable->testtask->fieldList['id']['fixed'] = 'left'; $config->project->dtable->testtask->fieldList['title']['name'] = 'name'; $config->project->dtable->testtask->fieldList['title']['title'] = $lang->testtask->name; $config->project->dtable->testtask->fieldList['title']['type'] = 'title'; $config->project->dtable->testtask->fieldList['title']['link'] = array('module' => 'testtask', 'method' => 'cases', 'params' => 'taskID={id}'); $config->project->dtable->testtask->fieldList['title']['group'] = '2'; -$config->project->dtable->testtask->fieldList['title']['fixed'] = false; +$config->project->dtable->testtask->fieldList['title']['fixed'] = 'left'; $config->project->dtable->testtask->fieldList['title']['width'] = '356'; $config->project->dtable->testtask->fieldList['title']['data-app'] = 'project'; @@ -498,6 +499,6 @@ $config->project->dtable->testtask->fieldList['actions']['name'] = 'actions' $config->project->dtable->testtask->fieldList['actions']['title'] = $lang->actions; $config->project->dtable->testtask->fieldList['actions']['type'] = 'actions'; $config->project->dtable->testtask->fieldList['actions']['sortType'] = false; -$config->project->dtable->testtask->fieldList['actions']['fixed'] = false; +$config->project->dtable->testtask->fieldList['actions']['fixed'] = 'right'; $config->project->dtable->testtask->fieldList['actions']['list'] = $config->testtask->actionList; -$config->project->dtable->testtask->fieldList['actions']['menu'] = array('cases', 'linkCase', 'report', 'edit', 'delete'); +$config->project->dtable->testtask->fieldList['actions']['menu'] = array(array('start', 'other' => array('activate', 'close')), 'cases', 'linkCase', 'report', 'edit', 'delete'); diff --git a/module/project/ui/testtask.html.php b/module/project/ui/testtask.html.php index c11bddfd87..3690ebc20b 100644 --- a/module/project/ui/testtask.html.php +++ b/module/project/ui/testtask.html.php @@ -70,7 +70,6 @@ dtable set::sortLink(createLink('project', 'testtask', "projectID={$project->id}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")), set::plugins(array('cellspan')), set::getCellSpan(jsRaw('window.getCellSpan')), - set::fixedLeftWidth('20%'), set::footToolbar($footToolbar), set::footPager(usePager(array (