diff --git a/module/project/js/task.js b/module/project/js/task.js index 73e67c4f37..e2a60c94f4 100644 --- a/module/project/js/task.js +++ b/module/project/js/task.js @@ -23,7 +23,7 @@ $(function() if($('#taskList thead th.w-name').width() < 150) $('#taskList thead th.w-name').width(150); - $(document).on('click', "#taskList tbody tr", function(){showCheckedSummary();}); + $(document).on('click', "#taskList tbody tr, .table-footer .check-all, #taskList thead .check-all", function(){showCheckedSummary();}); $(document).on('change', "#taskList :checkbox", function(){showCheckedSummary();}); $(document).on('click', "#datatable-taskList table tr", function(){showCheckedSummary();}); }); @@ -36,12 +36,7 @@ function setQueryBar(queryID, title) function showCheckedSummary() { - var $summary = $('tfoot .table-actions .text:last'); - if(!$summary.hasClass('readed')) - { - taskSummary = $summary.html(); - $summary.addClass('readed'); - } + var $summary = $('#main #mainContent form.main-table .table-header .table-statistic'); var checkedTotal = 0; var checkedWait = 0; @@ -70,7 +65,7 @@ function showCheckedSummary() .replace('%estimate%', checkedEstimate) .replace('%consumed%', checkedConsumed) .replace('%left%', checkedLeft); - $('tfoot .table-actions .text:last').html(summary); + $summary.html(summary); } else { diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php index 20a4cfb094..f69dfc6b0e 100644 --- a/module/project/view/task.html.php +++ b/module/project/view/task.html.php @@ -148,8 +148,6 @@ js::set('browseType', $browseType);
- edit, '', "class='btn btn-info btn-wide'");?> - delete, 'hiddenwin', "class='btn btn-info btn-wide'");?> tree->manage, '', "class='btn btn-info btn-wide'");?>
diff --git a/module/task/config.php b/module/task/config.php index 89f09267bc..286b6c65ac 100644 --- a/module/task/config.php +++ b/module/task/config.php @@ -197,5 +197,5 @@ $config->task->datatable->fieldList['lastEditedDate']['required'] = 'no'; $config->task->datatable->fieldList['actions']['title'] = 'actions'; $config->task->datatable->fieldList['actions']['fixed'] = 'right'; -$config->task->datatable->fieldList['actions']['width'] = '156'; +$config->task->datatable->fieldList['actions']['width'] = '160'; $config->task->datatable->fieldList['actions']['required'] = 'yes';