diff --git a/module/project/config.php b/module/project/config.php index cea74baa0d..78c2f28e31 100644 --- a/module/project/config.php +++ b/module/project/config.php @@ -92,14 +92,14 @@ $config->project->datatable->fieldList['estimate']['pri'] = '8'; $config->project->datatable->fieldList['consume']['title'] = 'consume'; $config->project->datatable->fieldList['consume']['fixed'] = 'no'; -$config->project->datatable->fieldList['consume']['width'] = '70'; +$config->project->datatable->fieldList['consume']['width'] = '80'; $config->project->datatable->fieldList['consume']['maxWidth'] = '80'; $config->project->datatable->fieldList['consume']['required'] = 'no'; $config->project->datatable->fieldList['consume']['sort'] = 'no'; $config->project->datatable->fieldList['consume']['pri'] = '7'; $config->project->datatable->fieldList['progress']['title'] = 'progress'; -$config->project->datatable->fieldList['progress']['fixed'] = 'right'; +$config->project->datatable->fieldList['progress']['fixed'] = 'no'; $config->project->datatable->fieldList['progress']['width'] = '60'; $config->project->datatable->fieldList['progress']['required'] = 'no'; $config->project->datatable->fieldList['progress']['sort'] = 'no'; diff --git a/module/project/view/browse.html.php b/module/project/view/browse.html.php index 22a6f3e066..841168cc08 100644 --- a/module/project/view/browse.html.php +++ b/module/project/view/browse.html.php @@ -11,6 +11,7 @@ */ ?> + recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"; + $vars = "programID=$programID&browseType=$browseType¶m=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"; + $datatableId = $this->moduleName . ucfirst($this->methodName); + $useDatatable = (isset($config->datatable->$datatableId->mode) and $config->datatable->$datatableId->mode == 'datatable'); + + if($useDatatable) include '../../common/view/datatable.html.php'; $setting = $this->datatable->getSetting('project'); ?> - + ';?> +
'> config->systemMode == 'new' ? common::hasPriv('project', 'batchEdit') : common::hasPriv('project', 'batchEdit');?> @@ -106,6 +112,7 @@ js::set('browseType', $browseType);
+ ';?>