Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

module/execution/control.php

@@ -2188,8 +2188,7 @@ class execution extends control
         if(!empty($_POST))
         {
             $this->execution->manageMembers($executionID);
-            $teamID = $this->dao->select('id')->from(TABLE_TEAM)->where('root')->eq($executionID)->andWhere('type')->eq('execution')->fetch('id');
-            $this->loadModel('action')->create('team', $teamID, 'managedTeam');
+            $this->loadModel('action')->create('team', $executionID, 'managedTeam');
             die(js::locate($this->createLink('execution', 'team', "executionID=$executionID"), 'parent'));
         }
 
@@ -2258,8 +2257,7 @@ class execution extends control
         $this->execution->unlinkMember($executionID, $account);
         if(!dao::isError())
         {
-            $teamID = $this->dao->select('id')->from(TABLE_TEAM)->where('root')->eq($executionID)->andWhere('type')->eq('execution')->fetch('id');
-            $this->loadModel('action')->create('team', $teamID, 'managedTeam');
+            $this->loadModel('action')->create('team', $executionID, 'managedTeam');
         }
 
         /* if ajax request, send result. */

module/execution/js/storyestimate.js

@@ -39,6 +39,7 @@ function showNewEstimate()
     $('.th-new-estimate').removeClass('hide');
     $('.new-estimate').removeClass('hide');
     $('.form-actions').removeClass('hide');
+    $('.empty-th').addClass('hide');
 }
 
 function selectRound(round)

module/execution/lang/de.php

@@ -95,6 +95,7 @@ $lang->execution->oneProduct      = "Only one stage can be linked {$lang->produc
 $lang->execution->noLinkProduct   = "Stage not linked {$lang->productCommon}";
 $lang->execution->recent          = 'Recent visits: ';
 $lang->execution->copyNoExecution = 'There are no ' . $lang->executionCommon . 'available to copy.';
+$lang->execution->noTeam          = 'No team members at the moment';
 
 $lang->execution->start    = 'Start';
 $lang->execution->activate = 'Aktivieren';

module/execution/lang/en.php

@@ -95,6 +95,7 @@ $lang->execution->oneProduct      = "Only one stage can be linked {$lang->produc
 $lang->execution->noLinkProduct   = "Stage not linked {$lang->productCommon}";
 $lang->execution->recent          = 'Recent visits: ';
 $lang->execution->copyNoExecution = 'There are no ' . $lang->executionCommon . 'available to copy.';
+$lang->execution->noTeam          = 'No team members at the moment';
 
 $lang->execution->start    = 'Start';
 $lang->execution->activate = 'Activate';

module/execution/lang/fr.php

@@ -95,6 +95,7 @@ $lang->execution->oneProduct      = "Only one stage can be linked {$lang->produc
 $lang->execution->noLinkProduct   = "Stage not linked {$lang->productCommon}";
 $lang->execution->recent          = 'Recent visits: ';
 $lang->execution->copyNoExecution = 'There are no ' . $lang->executionCommon . 'available to copy.';
+$lang->execution->noTeam          = 'No team members at the moment';
 
 $lang->execution->start    = 'Démarrer';
 $lang->execution->activate = 'Activer';

module/execution/lang/vi.php

@@ -95,6 +95,7 @@ $lang->execution->oneProduct      = "Only one stage can be linked {$lang->produc
 $lang->execution->noLinkProduct   = "Stage not linked {$lang->productCommon}";
 $lang->execution->recent          = 'Recent visits: ';
 $lang->execution->copyNoExecution = 'There are no ' . $lang->executionCommon . 'available to copy.';
+$lang->execution->noTeam          = 'No team members at the moment';
 
 $lang->execution->start    = 'Bắt đầu';
 $lang->execution->activate = 'Kích hoạt';

module/execution/lang/zh-cn.php

@@ -95,6 +95,7 @@ $lang->execution->oneProduct      = "阶段只能关联一个{$lang->productComm
 $lang->execution->noLinkProduct   = "阶段没有关联{$lang->productCommon}";
 $lang->execution->recent          = '近期访问：';
 $lang->execution->copyNoExecution = '没有可用的' . $lang->executionCommon . '来复制';
+$lang->execution->noTeam          = '暂时没有团队成员';
 
 $lang->execution->start    = "开始";
 $lang->execution->activate = "激活";

module/execution/view/storyestimate.html.php

@@ -22,6 +22,11 @@
   <div class="main-header">
     <h2><?php echo $lang->execution->storyEstimate;?></h2>
   </div>
+  <?php if(empty($team)):?>
+  <div class="table-empty-tip">
+    <p><span class="text-muted"><?php echo $lang->execution->noTeam;?></span></p>
+  </div>
+  <?php else:?>
   <div class='btn-toolbar pull-left'>
     <?php if(!empty($rounds)):?>
     <div class='input-group space w-200px'>
@@ -37,9 +42,10 @@
     <table class='table table-form'>
       <thead>
         <tr class='text-center'>
-          <th class='w-120px'><?php echo $lang->execution->team;?></th>
-          <th class='w-90px'> <?php echo $lang->story->estimate;?></th>
-          <th class='w-90px th-new-estimate hide'><?php echo $lang->execution->newEstimate;?></th>
+          <th><?php echo $lang->execution->team;?></th>
+          <th> <?php echo $lang->story->estimate;?></th>
+          <th class='th-new-estimate hide'><?php echo $lang->execution->newEstimate;?></th>
+          <th class='empty-th'></th>
         </tr>
       </thead>
       <tbody>
@@ -76,5 +82,6 @@
       </tfoot>
     </table>
   </form>
+  <?php endif;?>
 </div>
 <?php include '../../common/view/footer.html.php';?>