diff --git a/module/common/view/datatable.fix.html.php b/module/common/view/datatable.fix.html.php index 42e73afd95..8360b43b84 100644 --- a/module/common/view/datatable.fix.html.php +++ b/module/common/view/datatable.fix.html.php @@ -31,7 +31,7 @@ $(function() $dropmenu.append("
  • datatable->custom?>
  • "); } - if(currentModule != 'execution' && currentMethod != 'all') $dropmenu.append("
  • \", true);' id='switchToDatatable'>datatable->switchToDatatable : $lang->datatable->switchToTable;?>
  • "); + if(!(currentModule == 'execution' && currentMethod == 'all')) $dropmenu.append("
  • \", true);' id='switchToDatatable'>datatable->switchToDatatable : $lang->datatable->switchToTable;?>
  • "); $dropdown.append($dropmenu) .appendTo($btnToolbar) .on('shown.zui.dropdown', function(){$btnToolbar.closest('.table-header').css('z-index', 11);}) diff --git a/module/datatable/model.php b/module/datatable/model.php index 6e8b053129..49267b9bf6 100644 --- a/module/datatable/model.php +++ b/module/datatable/model.php @@ -90,7 +90,7 @@ class datatableModel extends model $set->id = $id; $set->show = true; $set->width = $fieldList[$id]['width']; - $set->fixed = isset($fieldList[$id]['fixed']) ? $fieldList[$id]['fixed'] : 'no'; + $set->fixed = $fieldList[$id]['fixed']; $set->title = $fieldList[$id]['title']; $set->sort = isset($fieldList[$id]['sort']) ? $fieldList[$id]['sort'] : 'yes'; $set->name = isset($fieldList[$id]['name']) ? $fieldList[$id]['name'] : ''; diff --git a/module/datatable/view/ajaxcustom.html.php b/module/datatable/view/ajaxcustom.html.php index 4c0242ef41..b210ac8104 100644 --- a/module/datatable/view/ajaxcustom.html.php +++ b/module/datatable/view/ajaxcustom.html.php @@ -62,8 +62,8 @@
    $col):?>
    ' data-key='' data-fixed='' data-width=''> diff --git a/module/execution/config.php b/module/execution/config.php index 3788017fb2..b6ee86008b 100644 --- a/module/execution/config.php +++ b/module/execution/config.php @@ -211,61 +211,74 @@ if(!isset($config->setCode) or $config->setCode == 1) $config->execution->datatable->fieldList['project']['title'] = 'project'; $config->execution->datatable->fieldList['project']['width'] = '200'; $config->execution->datatable->fieldList['project']['flex'] = 1; +$config->execution->datatable->fieldList['project']['fixed'] = 'no'; $config->execution->datatable->fieldList['project']['required'] = 'no'; $config->execution->datatable->fieldList['status']['title'] = 'execStatus'; $config->execution->datatable->fieldList['status']['type'] = 'status'; $config->execution->datatable->fieldList['status']['width'] = '100'; $config->execution->datatable->fieldList['status']['required'] = 'no'; +$config->execution->datatable->fieldList['status']['fixed'] = 'no'; $config->execution->datatable->fieldList['PM']['title'] = 'owner'; $config->execution->datatable->fieldList['PM']['width'] = '70'; $config->execution->datatable->fieldList['PM']['required'] = 'no'; +$config->execution->datatable->fieldList['PM']['fixed'] = 'no'; $config->execution->datatable->fieldList['openedDate']['title'] = 'openedDate'; $config->execution->datatable->fieldList['openedDate']['width'] = '85'; $config->execution->datatable->fieldList['openedDate']['required'] = 'no'; +$config->execution->datatable->fieldList['openedDate']['fixed'] = 'no'; $config->execution->datatable->fieldList['begin']['title'] = 'begin'; $config->execution->datatable->fieldList['begin']['width'] = '100'; $config->execution->datatable->fieldList['begin']['required'] = 'no'; +$config->execution->datatable->fieldList['begin']['fixed'] = 'no'; $config->execution->datatable->fieldList['end']['title'] = 'end'; $config->execution->datatable->fieldList['end']['width'] = '90'; $config->execution->datatable->fieldList['end']['required'] = 'no'; +$config->execution->datatable->fieldList['end']['fixed'] = 'no'; $config->execution->datatable->fieldList['realBegan']['title'] = 'realBegan'; $config->execution->datatable->fieldList['realBegan']['width'] = '90'; $config->execution->datatable->fieldList['realBegan']['required'] = 'no'; $config->execution->datatable->fieldList['realBegan']['sort'] = 'no'; +$config->execution->datatable->fieldList['realBegan']['fixed'] = 'no'; $config->execution->datatable->fieldList['realEnd']['title'] = 'realEnd'; $config->execution->datatable->fieldList['realEnd']['width'] = '90'; $config->execution->datatable->fieldList['realEnd']['required'] = 'no'; $config->execution->datatable->fieldList['realEnd']['sort'] = 'no'; +$config->execution->datatable->fieldList['realEnd']['fixed'] = 'no'; $config->execution->datatable->fieldList['estimate']['title'] = 'estimate'; $config->execution->datatable->fieldList['estimate']['width'] = '70'; $config->execution->datatable->fieldList['estimate']['required'] = 'no'; $config->execution->datatable->fieldList['estimate']['sort'] = 'no'; +$config->execution->datatable->fieldList['estimate']['fixed'] = 'no'; $config->execution->datatable->fieldList['consumed']['title'] = 'consumed'; $config->execution->datatable->fieldList['consumed']['width'] = '75'; $config->execution->datatable->fieldList['consumed']['required'] = 'no'; $config->execution->datatable->fieldList['consumed']['sort'] = 'no'; +$config->execution->datatable->fieldList['consumed']['fixed'] = 'no'; $config->execution->datatable->fieldList['left']['title'] = 'left'; $config->execution->datatable->fieldList['left']['width'] = '70'; $config->execution->datatable->fieldList['left']['required'] = 'no'; $config->execution->datatable->fieldList['left']['sort'] = 'no'; +$config->execution->datatable->fieldList['left']['fixed'] = 'no'; $config->execution->datatable->fieldList['progress']['title'] = 'progress'; $config->execution->datatable->fieldList['progress']['type'] = 'circleProgress'; $config->execution->datatable->fieldList['progress']['width'] = '70'; $config->execution->datatable->fieldList['progress']['required'] = 'no'; $config->execution->datatable->fieldList['progress']['sort'] = 'no'; +$config->execution->datatable->fieldList['progress']['fixed'] = 'no'; $config->execution->datatable->fieldList['burn']['title'] = 'burn'; $config->execution->datatable->fieldList['burn']['width'] = '80'; $config->execution->datatable->fieldList['burn']['required'] = 'no'; $config->execution->datatable->fieldList['burn']['sort'] = 'no'; +$config->execution->datatable->fieldList['burn']['fixed'] = 'no';