diff --git a/module/deliverable/ui/browse.html.php b/module/deliverable/ui/browse.html.php index b0b51d4fa9..a44ff59d4b 100644 --- a/module/deliverable/ui/browse.html.php +++ b/module/deliverable/ui/browse.html.php @@ -16,8 +16,44 @@ toolbar ); $cols = $config->deliverable->dtable->fieldList; +$modelList = $this->deliverable->buildModelList('all'); + +$summary = sprintf($lang->deliverable->summary, count($deliverables)); +$tableData = initTableData($deliverables, $cols, $this->deliverable); +$data = array(); +foreach($tableData as $key => $row) +{ + if($row->model) + { + $models = explode(',', $row->model); + foreach($models as $model) + { + $row->model = $modelList[$model]; + $row->rowspan = count($models); + $data[] = clone $row; + } + } + else + { + $data[] = $row; + } +} + dtable ( set::cols($cols), - set::data($deliverables) + set::data($data), + set::userMap($users), + set::orderBy($orderBy), + set::plugins(array('cellspan')), + set::checkable(false), + set::sortLink(createLink('deliverable', 'browse', "browseType=$browseType¶m={$param}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")), + set::getCellSpan(jsRaw('window.getCellSpan')), + set::footer(array($summary, 'flex', 'pager')), + set::footPager(usePager(array + ( + 'recTotal' => $pager->recTotal, + 'recPerPage' => $pager->recPerPage, + 'linkCreator' => helper::createLink('deliverable', 'browse', "browseType=$browseType¶m={$param}&orderBy=$orderBy&recTotal={$pager->recTotal}&recPerPage={recPerPage}&page={page}") + ))) ); diff --git a/module/deliverable/ui/create.html.php b/module/deliverable/ui/create.html.php index 10a25c1454..a888e08f74 100644 --- a/module/deliverable/ui/create.html.php +++ b/module/deliverable/ui/create.html.php @@ -44,6 +44,7 @@ formPanel picker ( set::name('model'), + set::multiple(true), set::items($modelList) ) ),