diff --git a/module/mr/view/browse.html.php b/module/mr/view/browse.html.php index 8efb8b258c..37c6f1dab6 100644 --- a/module/mr/view/browse.html.php +++ b/module/mr/view/browse.html.php @@ -3,7 +3,7 @@ * The view file for browse page of mr module of ZenTaoPMS. * * @copyright Copyright 2009-2012 青岛易软天创网络科技有限公司 (QingDao Nature Easy Soft Network Technology Co,LTD www.cnezsoft.com) - * @author Wang Yidong, Zhu Jinyong + * @author Guodong Ding * @package mr * @version $Id: create.html.php $ */ @@ -11,7 +11,7 @@
@@ -42,38 +42,30 @@ - + - id; ?> - title; ?> - loadModel('gitlab')->apiGetSingleProject($mr->gitlabID, $mr->sourceProject)->name_with_namespace; ?> - sourceBranch;?> - loadModel('gitlab')->apiGetSingleProject($mr->gitlabID, $mr->targetProject)->name_with_namespace; ?> - targetBranch;?> - mr->statusList, $mr->status);?> - mr->mergeStatusList, $mr->mergeStatus);?> + id; ?> + title; ?> + loadModel('gitlab')->apiGetSingleProject($MR->gitlabID, $MR->sourceProject)->name_with_namespace; ?> + sourceBranch;?> + loadModel('gitlab')->apiGetSingleProject($MR->gitlabID, $MR->targetProject)->name_with_namespace; ?> + targetBranch;?> + mr->statusList, $MR->status);?> + mr->mergeStatusList, $MR->mergeStatus);?> id}", '', '', "title='{$lang->mr->view}' class='btn btn-info'"); - common::printLink('mr', 'edit', "mrID=$mr->id", '', '', "title='{$lang->mr->edit}' class='btn btn-info'"); - common::printLink('mr', 'diff', "mr={$mr->id}", '', '', "title='{$lang->mr->diff}' class='btn btn-info'"); - if(common::hasPriv('mr', 'delete')) echo html::a($this->createLink('mr', 'delete', "id=$mr->id"), '', 'hiddenwin', "title='{$lang->mr->delete}' class='btn'"); + common::printLink('mr', 'view', "mr={$MR->id}", '', '', "title='{$lang->mr->view}' class='btn btn-info'"); + common::printLink('mr', 'edit', "mr={$MR->id}", '', '', "title='{$lang->mr->edit}' class='btn btn-info'"); + common::printLink('mr', 'diff', "mr={$MR->id}", '', '', "title='{$lang->mr->diff}' class='btn btn-info'"); + common::printLink('mr', 'delete', "mr={$MR->id}", '', '', "title='{$lang->mr->delete}' class='btn btn-info'"); ?> - - - +
-/** - * - */ -/** - * - */