diff --git a/module/projectrelease/css/browse.css b/module/projectrelease/css/browse.css index 8f2f032ebf..f9c5e49f9e 100644 --- a/module/projectrelease/css/browse.css +++ b/module/projectrelease/css/browse.css @@ -2,6 +2,7 @@ #releaseList tr:hover {background-color:unset;} td {overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} -.c-build {width: 250px;} +.c-build {width: 300px;} +.c-branch {width: 200px;} td.c-build {padding-left:8px !important;} .c-product, .c-execution {width: 120px;} diff --git a/module/projectrelease/model.php b/module/projectrelease/model.php index 9311581055..ddb459c82a 100644 --- a/module/projectrelease/model.php +++ b/module/projectrelease/model.php @@ -70,7 +70,20 @@ class projectreleaseModel extends model { $release->project = trim($release->project, ','); $release->branch = trim($release->branch, ','); - $release->build = trim($release->build, ','); + + $branchName = ''; + if($release->branch != 'normal') + { + foreach(explode(',', $release->branch) as $releaseBranch) + { + $branchName .= $this->loadModel('branch')->getById($releaseBranch); + $branchName .= ','; + } + $branchName = trim($branchName, ','); + } + $release->branchName = empty($branchName) ? $this->lang->branch->main : $branchName; + $release->build = trim($release->build, ','); + $buildIdList = array_merge($buildIdList, explode(',', $release->build)); } diff --git a/module/projectrelease/view/browse.html.php b/module/projectrelease/view/browse.html.php index befa815247..a45658db49 100644 --- a/module/projectrelease/view/browse.html.php +++ b/module/projectrelease/view/browse.html.php @@ -53,6 +53,7 @@ projectrelease->product;?> release->includedBuild;?> + release->branch;?> release->status;?> release->date;?> createLink($build->execution ? 'build' : 'projectbuild', 'view', "buildID=$buildID"), $build->name, '', "data-app='project' title='name;?>'");?> processStatus('release', $release);?> + class='c-branch text-center'>branchName; ?> class='c-status text-center' title=''> diff --git a/module/release/model.php b/module/release/model.php index 5b94a157b0..a765ad3f25 100644 --- a/module/release/model.php +++ b/module/release/model.php @@ -222,7 +222,11 @@ class releaseModel extends model if($linkedBuilds) $builds += $this->dao->select('id,project,branch,builds,stories,bugs')->from(TABLE_BUILD)->where('id')->in($linkedBuilds)->fetchAll('id'); foreach($builds as $build) { - $branches[$build->branch] = $build->branch; + foreach(explode(',', $build->branch) as $buildBranch) + { + if(!isset($branches[$buildBranch])) $branches[$buildBranch] = $buildBranch; + } + $projects[$build->project] = $build->project; if($this->post->sync)