diff --git a/module/projectrelease/view/browse.html.php b/module/projectrelease/view/browse.html.php index 36de8640c2..895fff64f2 100644 --- a/module/projectrelease/view/browse.html.php +++ b/module/projectrelease/view/browse.html.php @@ -46,11 +46,11 @@ release->id;?> release->name;?> + release->build;?> release->product;?> executionCommon;?> - release->build;?> - release->date;?> release->status;?> + release->date;?> projectrelease->getFlowExtendFields(); foreach($extendFields as $extendField) echo "{$extendField->name}"; @@ -68,14 +68,14 @@ echo html::a(inlink('view', "release=$release->id"), $release->name, '', "data-app='$from'") . $flagIcon; ?> + execution) ? $release->buildName : html::a($this->createLink('build', 'view', "buildID=$release->buildID"), $release->buildName);?> productName?> executionName?> - execution) ? $release->buildName : html::a($this->createLink('build', 'view', "buildID=$release->buildID"), $release->buildName);?> - date;?> processStatus('release', $release);?> + date;?> " . $this->loadModel('flow')->getFieldValue($extendField, $release) . "";?> projectrelease->buildOperateMenu($release, 'browse');?> diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php index cccf46cd3a..e116d6c677 100644 --- a/module/release/view/browse.html.php +++ b/module/release/view/browse.html.php @@ -48,13 +48,13 @@ release->id;?> release->name;?> - release->project;?> release->build;?> type != 'normal'):?> product->branch;?> - release->date;?> + release->project;?> release->status;?> + release->date;?> release->getFlowExtendFields(); foreach($extendFields as $extendField) echo "{$extendField->name}"; @@ -73,16 +73,16 @@ echo html::a(inlink('view', "release=$release->id"), $release->name, '', "title='$release->name'") . $flagIcon; ?> - projectName;?> execution) ? $release->buildName : html::a($this->createLink('build', 'view', "buildID=$release->buildID"), $release->buildName);?> type != 'normal'):?> '>branch];?> - date;?> + projectName;?> processStatus('release', $release);?> + date;?> " . $this->loadModel('flow')->getFieldValue($extendField, $release) . "";?> release->buildOperateMenu($release, 'browse');?>