Merge branch 'master' of github.com:easysoft/zentaopms

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');

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',

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();

module/story/view/review.html.php

@@ -38,6 +38,14 @@ var assignedTo = '<?php $story->lastEditedBy ? print($story->lastEditedBy) : pri
             <th><?php echo $lang->story->rejectedReason;?></th>
             <td><?php echo html::select('closedReason', $lang->story->reasonList, '', 'class=form-control onchange="setStory(this.value)"');?></td><td></td>
           </tr>
+          <tr id='priBox' class='hide'>
+            <th><?php echo $lang->story->pri;?></th>
+            <td><?php echo html::select('pri', $lang->story->priList, '',"class='form-control' autocomplete='off'");?></td><td></td>
+          </tr>
+          <tr id='estimateBox' class='hide'>
+            <th><?php echo $lang->story->estimate;?></th>
+            <td><?php echo html::input('estimate', '', "class='form-control' autocomplete='off'");?></td><td></td>
+          </tr>
           <tr id='duplicateStoryBox' class='hide'>
             <th><?php echo $lang->story->duplicateStory;?></th>
             <td><?php echo html::input('duplicateStory', '', "class='form-control' autocomplete='off'");?></td><td></td>

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';

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      = '编号';

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 "<span class='label label-info label-outline'>{$branches[$case->branch]}</span> ";
                 if($modulePairs and $case->module) echo "<span class='label label-gray label-badge'>{$modulePairs[$case->module]}</span> ";
-                echo $canView ? html::a($caseLink, $case->title, null, "style='color: $case->color'") : "<span style='color: $case->color'>$case->title</span>";
+                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'")) : "<span style='color: $case->color'>$case->title</span>";
                 break;
             case 'branch':
                 echo $branches[$case->branch];

module/testcase/view/view.html.php

@@ -20,6 +20,9 @@
     <div class="page-title">
       <span class='label label-id'><?php echo $case->id;?></span>
       <span class='text' title='<?php echo $case->title;?>' style='color: <?php echo $case->color; ?>'><?php echo $case->title;?></span>
+      <?php if($case->fromCaseID):?>
+      <small><?php echo html::a(helper::createLink('testcase', 'view', "caseID=$case->fromCaseID"), html::icon($lang->icons['testcase']) . " {$lang->testcase->fromCase}$lang->colon$case->fromCaseID");?></small>
+      <?php endif;?>
 
       <?php if($case->deleted):?>
       <span class='label label-danger'><?php echo $lang->product->deleted;?></span>

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,

module/testsuite/view/createcase.html.php

@@ -109,7 +109,7 @@
             <table class='table table-form mg-0 table-bordered' style='border: 1px solid #ddd'>
               <thead>
                 <tr>
-                  <th class='w-40px text-right'><?php echo $lang->testcase->stepID;?></th>
+                  <th class='w-50px text-right'><?php echo $lang->testcase->stepID;?></th>
                   <th width="45%"><?php echo $lang->testcase->stepDesc;?></th>
                   <th><?php echo $lang->testcase->stepExpect;?></th>
                   <th class='step-actions'><?php echo $lang->actions;?></th>