diff --git a/config/zentaopms.php b/config/zentaopms.php index 5e57c970f7..2af32b18bf 100644 --- a/config/zentaopms.php +++ b/config/zentaopms.php @@ -402,4 +402,7 @@ $config->waterfallModules = array('workestimation', 'durationestimation', 'budge $config->showMainMenu = true; $config->maxPriValue = '256'; -$config->importWhiteList = array('user', 'task', 'story', 'bug', 'testcase', 'feedback'); \ No newline at end of file +$config->importWhiteList = array('user', 'task', 'story', 'bug', 'testcase', 'feedback'); + +$config->dtable = new stdclass(); +$config->dtable->colVars = array('width', 'type', 'flex', 'fixed'); diff --git a/module/program/js/browse.js b/module/program/js/browse.js index 1bf95edd1f..1e159d9da6 100644 --- a/module/program/js/browse.js +++ b/module/program/js/browse.js @@ -79,24 +79,26 @@ function showEditCheckbox(show) { $('.icon-project,.icon-waterfall,.icon-scrum,.icon-kanban').each(function() { - $this = $(this); - $tr = $(this).closest('tr'); - projectID = $tr.attr('data-id'); + var $this = $(this); + var $tr = $(this).closest('dtable-row'); + var projectID = $tr.attr('data-id'); + var $firstDiv = $tr.find('.dtable-flexable div:first'); if(show) { - var marginLeft = $tr.find('td:first').find('span.table-nest-icon').css('margin-left'); + var marginLeft = $firstDiv.find('span.table-nest-icon').css('margin-left'); - $tr.find('td:first').prepend("
"); - $tr.find('td:first').find('.checkbox-primary').css('margin-left', marginLeft).css('width', '14'); - $tr.find('td:first').find('span.table-nest-icon').css('margin-left', '0'); + $firstDiv.prepend(""); + $firstDiv.find('.checkbox-primary').css('margin-left', marginLeft).css('width', '14'); + $firstDiv.find('span.table-nest-icon').css('margin-left', '0'); } else { - var marginLeft = $tr.find('td:first').find('.checkbox-primary').css('margin-left'); - $tr.find('td:first').find('span.table-nest-icon').css('margin-left', marginLeft); - $tr.find('td:first').find('[name^="projectIdList"]').parent().remove(); + var marginLeft = $firstDiv.find('.checkbox-primary').css('margin-left'); + $firstDiv.find('span.table-nest-icon').css('margin-left', marginLeft); + $firstDiv.find('[name^="projectIdList"]').parent().remove(); } }); + if(show && hasProject) { var tableFooter = "