Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8

db/update9.8.1.sql

@@ -0,0 +1 @@
+ALTER TABLE `zt_user` CHANGE `realname` `realname` varchar(100) COLLATE 'utf8_general_ci' NOT NULL DEFAULT '' AFTER `password`;

module/common/lang/en.php

@@ -73,6 +73,7 @@ $lang->tutorial        = 'Tutorial';
 $lang->changeLog       = 'Change Log';
 $lang->manual          = 'Manual';
 $lang->customMenu      = 'Custom Menu';
+$lang->lineNumber      = 'Line No.';
 $lang->tutorialConfirm = 'You are using tutorial. Do you want to exit right now？';
 
 $lang->preShortcutKey  = '[Shortcut:←]';

module/common/lang/zh-cn.php

@@ -73,6 +73,7 @@ $lang->tutorial        = '新手教程';
 $lang->changeLog       = '修改日志';
 $lang->manual          = '手册';
 $lang->customMenu      = '自定义导航';
+$lang->lineNumber      = '行号';
 $lang->tutorialConfirm = '检测到你尚未退出新手教程模式，是否现在退出？';
 
 $lang->preShortcutKey  = '[快捷键:←]';

module/task/model.php

@@ -1102,6 +1102,7 @@ class taskModel extends model
             ->get();
 
         $this->dao->update(TABLE_TASK)->data($task)->autoCheck()->where('id')->eq((int)$taskID)->exec();
+        $this->updateParentStatus($oldTask->parent);
         $this->computeWorkingHours($oldTask->parent);
         if($oldTask->story) $this->loadModel('story')->setStage($oldTask->story);
         if(!dao::isError()) return common::createChanges($oldTask, $task);

module/testcase/view/showimport.html.php

@@ -9,6 +9,7 @@
   <table class='table table-fixed active-disabled table-custom' id='showData'>
     <thead>
       <tr>
+      <th class='w-50px'><?php echo $lang->lineNumber?></th>
         <th class='w-70px'><?php echo $lang->testcase->id?></th>
         <th><?php echo $lang->testcase->title?></th>
         <?php if(!empty($branches)):?>
@@ -39,6 +40,7 @@
       <?php foreach($caseData as $key => $case):?>
       <?php if(empty($case->title)) continue;?>
       <tr valign='top' align='center'>
+        <td><?php echo $key;?></td>
         <td>
           <?php
           if(!empty($case->id))
@@ -48,7 +50,7 @@
           }
           else
           {
-              echo $addID++ . " <sub class='gray' style='vertical-align:sub;'>{$lang->testcase->new}</sub>";
+              echo "<sub class='gray' style='vertical-align:sub;'>{$lang->testcase->new}</sub>";
           }
           echo html::hidden("product[$key]", $productID);
           ?>
@@ -83,7 +85,7 @@
     </tbody>
     <tfoot>
       <tr>
-        <td colspan='<?php echo !empty($branches) ? 11 : 10;?>' class='text-center'>
+        <td colspan='<?php echo !empty($branches) ? 12 : 11;?>' class='text-center'>
           <?php
           if(!$insert)
           {