From b6ea0afcb46567c81f0e016f869ea2173fb38c30 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Thu, 6 Jan 2022 16:56:27 +0800
Subject: [PATCH] * Finish task #47090 #47098.

---
 module/doc/js/common.js             | 6 +++---
 module/doc/view/createlib.html.php  | 2 +-
 module/doc/view/editlib.html.php    | 2 +-
 module/execution/control.php        | 1 +
 module/execution/view/task.html.php | 3 +--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/module/doc/js/common.js b/module/doc/js/common.js
index c64d0268ba..7897bc8101 100644
--- a/module/doc/js/common.js
+++ b/module/doc/js/common.js
@@ -24,12 +24,12 @@ function toggleAcl(acl, type)
     if(acl == 'custom')
     {
         $('#whiteListBox').removeClass('hidden');
-        $('#groupWhiteListBox').removeClass('hidden');
+        $('#groupBox').removeClass('hidden');
     }
     else if(acl == 'private')
     {
         $('#whiteListBox').removeClass('hidden');
-        $('#groupWhiteListBox').addClass('hidden');
+        $('#groupBox').addClass('hidden');
     }
     else
     {
@@ -48,7 +48,7 @@ function toggleAcl(acl, type)
         {
             link = createLink('doc', 'ajaxGetWhitelist', 'doclibID=' + doclibID + '&acl=' + acl);
             $.get(link, function(users)
-            {   
+            {
                 $('#users').replaceWith(users);
                 $('#users_chosen').remove();
                 $('#users').chosen();
diff --git a/module/doc/view/createlib.html.php b/module/doc/view/createlib.html.php
index 0bce51f4cf..f9c701c3af 100644
--- a/module/doc/view/createlib.html.php
+++ b/module/doc/view/createlib.html.php
@@ -59,7 +59,7 @@
             <tr id='whiteListBox' class='hidden'>
               <th><?php echo $lang->doc->whiteList;?></th>
               <td>
-                <div id='groupWhiteListBox' class='input-group'>
+                <div id='groupBox' class='input-group'>
                   <span class='input-group-addon groups-addon'><?php echo $lang->doclib->group?></span>
                   <?php echo html::select('groups[]', $groups, '', "class='form-control chosen' multiple")?>
                 </div>
diff --git a/module/doc/view/editlib.html.php b/module/doc/view/editlib.html.php
index b82f1e1cad..b7fbea8ac6 100644
--- a/module/doc/view/editlib.html.php
+++ b/module/doc/view/editlib.html.php
@@ -64,7 +64,7 @@
       <tr id='whiteListBox' class='hidden'>
         <th><?php echo $lang->doc->whiteList?></th>
         <td>
-          <div id='groupWhiteListBox' class='input-group'>
+          <div id='groupBox' class='input-group'>
             <span class='input-group-addon groups-addon'><?php echo $lang->doclib->group?></span>
             <?php echo html::select('groups[]', $groups, $lib->groups, "class='form-control chosen' multiple")?>
           </div>
diff --git a/module/execution/control.php b/module/execution/control.php
index b53b05cbcb..58077ea694 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -239,6 +239,7 @@ class execution extends control
         $this->view->setModule    = true;
         $this->view->canBeChanged = common::canModify('execution', $execution); // Determines whether an object is editable.
         $this->view->showBranch   = $showBranch;
+        $this->view->projectName  = $this->config->systemMode == 'new' ? $this->loadModel('project')->getById($execution->project)->name . ' / ' . $execution->name : $execution->name;
 
         $this->display();
     }
diff --git a/module/execution/view/task.html.php b/module/execution/view/task.html.php
index 0d96d08bc5..a45516db5d 100644
--- a/module/execution/view/task.html.php
+++ b/module/execution/view/task.html.php
@@ -182,8 +182,7 @@ body {margin-bottom: 25px;}
 <?php if($this->app->getViewType() == 'xhtml'):?>
 <div id="xx-title">
   <strong>
-  <?php $projectName = $this->config->systemMode == 'new' ? $this->project->getById($execution->project)->name . ' / ' : '';?>
-  <?php echo ($projectName . $this->execution->getByID($execution->id)->name);?>
+  <?php echo $projectName;?>
   </strong>
   <div class="linkButton" onclick="handleLinkButtonClick()">
     <span title="<?php echo $lang->viewDetails;?>">