diff --git a/module/bug/config/table.php b/module/bug/config/table.php index f26fc38786..7c4fa75800 100644 --- a/module/bug/config/table.php +++ b/module/bug/config/table.php @@ -194,6 +194,8 @@ if($config->edition != 'open') $config->bug->dtable->fieldList['relatedObject']['data-size'] = 'lg'; $config->bug->dtable->fieldList['relatedObject']['show'] = true; $config->bug->dtable->fieldList['relatedObject']['group'] = 8; + $config->bug->dtable->fieldList['relatedObject']['flex'] = false; + $config->bug->dtable->fieldList['relatedObject']['align'] = 'center'; } $config->bug->dtable->fieldList['activatedDate']['title'] = $lang->bug->activatedDate; diff --git a/module/design/config/dtable.php b/module/design/config/dtable.php index 65e951ce51..4c203e6e6f 100644 --- a/module/design/config/dtable.php +++ b/module/design/config/dtable.php @@ -39,6 +39,22 @@ $config->design->dtable->fieldList['createdBy']['sortType'] = true; $config->design->dtable->fieldList['createdDate']['type'] = 'date'; +if($config->edition != 'open') +{ + $config->design->dtable->fieldList['relatedObject']['name'] = 'relatedObject'; + $config->design->dtable->fieldList['relatedObject']['title'] = $lang->custom->relateObject; + $config->design->dtable->fieldList['relatedObject']['sortType'] = false; + $config->design->dtable->fieldList['relatedObject']['width'] = '70'; + $config->design->dtable->fieldList['relatedObject']['type'] = 'text'; + $config->design->dtable->fieldList['relatedObject']['link'] = common::hasPriv('custom', 'showRelationGraph') ? "RAWJSRAWJS" : null; + $config->design->dtable->fieldList['relatedObject']['data-toggle'] = 'modal'; + $config->design->dtable->fieldList['relatedObject']['data-size'] = 'lg'; + $config->design->dtable->fieldList['relatedObject']['show'] = true; + $config->design->dtable->fieldList['relatedObject']['group'] = 2; + $config->design->dtable->fieldList['relatedObject']['flex'] = false; + $config->design->dtable->fieldList['relatedObject']['align'] = 'center'; +} + $config->design->dtable->fieldList['actions']['type'] = 'actions'; $config->design->dtable->fieldList['actions']['menu'] = array('edit', 'viewCommit', 'delete'); $config->design->dtable->fieldList['actions']['list'] = $config->design->actionList; diff --git a/module/design/control.php b/module/design/control.php index 8606aff457..22efe9fa0a 100755 --- a/module/design/control.php +++ b/module/design/control.php @@ -112,8 +112,14 @@ class design extends control if(isset($project->hasProduct) && $project->hasProduct) $this->config->design->dtable->fieldList['product']['map'] = $this->view->products; if(!helper::hasFeature('devops')) $this->config->design->dtable->fieldList['actions']['menu'] = array('edit', 'delete'); + $designs = $this->design->getList($projectID, $productID, $type, $queryID, $orderBy, $pager); + if($this->config->edition != 'open') + { + foreach($designs as $design) $design->relatedObject = $this->loadModel('custom')->getRelatedObjectList($design->id, 'design', true); + } + $this->view->title = $this->lang->design->common . $this->lang->hyphen . $this->lang->design->browse; - $this->view->designs = $this->design->getList($projectID, $productID, $type, $queryID, $orderBy, $pager); + $this->view->designs = $designs; $this->view->projectID = $projectID; $this->view->productID = $productID; $this->view->type = $type; diff --git a/module/story/config/dtable.php b/module/story/config/dtable.php index c87f30edd0..68ce4212d4 100644 --- a/module/story/config/dtable.php +++ b/module/story/config/dtable.php @@ -219,6 +219,8 @@ if($config->edition != 'open') $config->story->dtable->fieldList['relatedObject']['data-size'] = 'lg'; $config->story->dtable->fieldList['relatedObject']['show'] = true; $config->story->dtable->fieldList['relatedObject']['group'] = 7; + $config->story->dtable->fieldList['relatedObject']['flex'] = false; + $config->story->dtable->fieldList['relatedObject']['align'] = 'center'; } $config->story->dtable->fieldList['childItem']['name'] = 'childItem'; diff --git a/module/task/config/dtable.php b/module/task/config/dtable.php index bee11a99aa..8cdd2b8c40 100644 --- a/module/task/config/dtable.php +++ b/module/task/config/dtable.php @@ -127,6 +127,8 @@ if($config->edition != 'open') $config->task->dtable->fieldList['relatedObject']['data-size'] = 'lg'; $config->task->dtable->fieldList['relatedObject']['show'] = true; $config->task->dtable->fieldList['relatedObject']['group'] = 5; + $config->task->dtable->fieldList['relatedObject']['flex'] = false; + $config->task->dtable->fieldList['relatedObject']['align'] = 'center'; } $config->task->dtable->fieldList['closedBy']['type'] = 'user'; diff --git a/module/testcase/config/table.php b/module/testcase/config/table.php index 936e343630..70cdc7ba01 100644 --- a/module/testcase/config/table.php +++ b/module/testcase/config/table.php @@ -143,6 +143,8 @@ if($config->edition != 'open') $config->testcase->dtable->fieldList['relatedObject']['data-size'] = 'lg'; $config->testcase->dtable->fieldList['relatedObject']['show'] = true; $config->testcase->dtable->fieldList['relatedObject']['group'] = 5; + $config->testcase->dtable->fieldList['relatedObject']['flex'] = false; + $config->testcase->dtable->fieldList['relatedObject']['align'] = 'center'; } $config->testcase->dtable->fieldList['version']['title'] = $lang->testcase->version;