diff --git a/module/doc/js/browse.js b/module/doc/js/browse.js index 8403b5ff6f..f5427fdb6b 100644 --- a/module/doc/js/browse.js +++ b/module/doc/js/browse.js @@ -16,7 +16,6 @@ function browseBySearch() $(function() { if(browseType == 'bysearch') return; - $('#pageActions ul.dropdown-menu').css('left', '67px'); if(browseType == 'byediteddate' || browseType == 'openedbyme' || browseType == 'collectedbyme') { $('#pageActions ul.dropdown-menu').css('left', '0px'); diff --git a/module/doc/js/common.js b/module/doc/js/common.js index b5603a84e4..dba17c5d23 100644 --- a/module/doc/js/common.js +++ b/module/doc/js/common.js @@ -24,6 +24,7 @@ function setBrowseType(type) $(document).ready(function() { + $('#pageActions ul.dropdown-menu').css('left', '67px'); $('.libs-group.sort').sortable( { trigger: '.lib', diff --git a/module/story/js/review.js b/module/story/js/review.js index d44a6b7135..14126ccacd 100644 --- a/module/story/js/review.js +++ b/module/story/js/review.js @@ -4,11 +4,15 @@ function switchShow(result) { $('#rejectedReasonBox').show(); $('#preVersionBox').hide(); + $('#priBox').hide(); + $('#estimateBox').hide(); $('#assignedTo').val('closed'); $('#assignedTo').trigger("chosen:updated"); } - else if(result == 'revert') + else if(result == 'clarify') { + $('#priBox').hide(); + $('#estimateBox').hide(); $('#preVersionBox').show(); $('#rejectedReasonBox').hide(); $('#duplicateStoryBox').hide(); @@ -18,6 +22,8 @@ function switchShow(result) } else { + $('#priBox').show(); + $('#estimateBox').show(); $('#preVersionBox').hide(); $('#rejectedReasonBox').hide(); $('#duplicateStoryBox').hide(); diff --git a/module/story/view/review.html.php b/module/story/view/review.html.php index 469749a8b6..468947cd06 100644 --- a/module/story/view/review.html.php +++ b/module/story/view/review.html.php @@ -38,6 +38,14 @@ var assignedTo = 'lastEditedBy ? print($story->lastEditedBy) : pri story->rejectedReason;?> story->reasonList, '', 'class=form-control onchange="setStory(this.value)"');?> + + story->pri;?> + story->priList, '',"class='form-control' autocomplete='off'");?> + + + story->estimate;?> + + story->duplicateStory;?> diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php index 86a6d396b1..7479b0c541 100644 --- a/module/testcase/lang/en.php +++ b/module/testcase/lang/en.php @@ -63,6 +63,7 @@ $lang->testcase->stepNumber = 'No.. of steps'; $lang->testcase->stepNumberAB = 'S'; $lang->testcase->createBug = 'Convert to Bug'; $lang->testcase->fromModule = 'Source Module'; +$lang->testcase->fromCase = 'Source Case'; $lang->case = $lang->testcase; // For dao checking using. Because 'case' is a php keywords, so the module name is testcase, table name is still case. $lang->testcase->stepID = 'ID'; diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php index c4c5c6faad..dc74f6d72d 100644 --- a/module/testcase/lang/zh-cn.php +++ b/module/testcase/lang/zh-cn.php @@ -63,6 +63,7 @@ $lang->testcase->stepNumber = '用例步骤数'; $lang->testcase->stepNumberAB = 'S'; $lang->testcase->createBug = '转Bug'; $lang->testcase->fromModule = '来源模块'; +$lang->testcase->fromCase = '来源用例'; $lang->case = $lang->testcase; // 用于DAO检查时使用。因为case是系统关键字,所以无法定义该模块为case,只能使用testcase,但表还是使用的case。 $lang->testcase->stepID = '编号'; diff --git a/module/testcase/model.php b/module/testcase/model.php index 71537ca6ab..ead71b3457 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -1334,9 +1334,10 @@ class testcaseModel extends model */ public function printCell($col, $case, $users, $branches, $modulePairs = array(), $browseType = '', $mode = 'datatable') { - $canView = common::hasPriv('testcase', 'view'); - $caseLink = helper::createLink('testcase', 'view', "caseID=$case->id&version=$case->version"); - $account = $this->app->user->account; + $canView = common::hasPriv('testcase', 'view'); + $caseLink = helper::createLink('testcase', 'view', "caseID=$case->id&version=$case->version"); + $account = $this->app->user->account; + $fromCaseID = $case->fromCaseID; $id = $col->id; if($col->show) { @@ -1370,7 +1371,7 @@ class testcaseModel extends model case 'title': if($case->branch) echo "{$branches[$case->branch]} "; if($modulePairs and $case->module) echo "{$modulePairs[$case->module]} "; - echo $canView ? html::a($caseLink, $case->title, null, "style='color: $case->color'") : "$case->title"; + echo $canView ? ($fromCaseID ? html::a($caseLink, $case->title, null, "style='color: $case->color'") . '[' . html::a(helper::createLink('testcase', 'view', "caseID=$fromCaseID"), "{$this->lang->testcase->fromCase}#$fromCaseID". ']') : html::a($caseLink, $case->title, null, "style='color: $case->color'")) : "$case->title"; break; case 'branch': echo $branches[$case->branch]; diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php index 1ba8d8cf2a..0fcd00daf2 100644 --- a/module/testcase/view/view.html.php +++ b/module/testcase/view/view.html.php @@ -20,6 +20,9 @@
id;?> title;?> + fromCaseID):?> + fromCaseID"), html::icon($lang->icons['testcase']) . " {$lang->testcase->fromCase}$lang->colon$case->fromCaseID");?> + deleted):?> product->deleted;?> diff --git a/module/testsuite/css/createcase.css b/module/testsuite/css/createcase.css index 360a47968a..49ce2f5d4f 100644 --- a/module/testsuite/css/createcase.css +++ b/module/testsuite/css/createcase.css @@ -32,7 +32,7 @@ #steps .step-type-menu > a.active {color: #fff; background-color: #1a4f85;} .table-bordered .step-actions {width: 98px;} -.table-bordered > #steps > tr > td {padding: 0; background-color: #fafafa; border: 1px solid #ddd!important; border-left-style: dotted!important; border-right-style: dotted!important;} +.table-bordered > #steps > tr > td {padding: 0; background-color: #fafafa; border: 1px solid #ddd!important; } .table-bordered > #steps > tr > td.step-id { padding-right: 8px;} .table-bordered > #steps > tr > td .btn {border-color: transparent; background-color: transparent} .table-bordered > #steps > tr > td .btn:hover, diff --git a/module/testsuite/view/createcase.html.php b/module/testsuite/view/createcase.html.php index 9b1ab2861a..a3dd3c49df 100644 --- a/module/testsuite/view/createcase.html.php +++ b/module/testsuite/view/createcase.html.php @@ -109,7 +109,7 @@ - +
testcase->stepID;?>testcase->stepID;?> testcase->stepDesc;?> testcase->stepExpect;?> actions;?>