From b2324c3406a107c05987b03d9d8b0c9491eb5cd8 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Mon, 17 Jan 2022 10:13:31 +0800
Subject: [PATCH] * Fix bug #18485,#18474.

---
 module/execution/js/create.js         | 2 +-
 module/execution/js/kanban.js         | 2 +-
 module/execution/view/create.html.php | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/module/execution/js/create.js b/module/execution/js/create.js
index 4420527143..2e76285f06 100644
--- a/module/execution/js/create.js
+++ b/module/execution/js/create.js
@@ -1,6 +1,6 @@
 function setCopyProject(executionID)
 {
-    location.href = createLink('execution', 'create', 'projectID=&executionID=0&copyExecutionID=' + executionID);
+    location.href = createLink('execution', 'create', 'projectID=' + projectID + '&executionID=0&copyExecutionID=' + executionID);
 }
 
 $(function()
diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js
index e8b43262f4..3e604123a9 100644
--- a/module/execution/js/kanban.js
+++ b/module/execution/js/kanban.js
@@ -306,7 +306,7 @@ function renderUserAvatar(user, objectType, objectID, size)
     if(!user) return $('<a class="avatar has-text ' + avatarSizeClass + ' avatar-circle iframe" title="' + noAssigned + '" style="background: #ccc" href="' + link + '" data-toggle="modal" data-width="80%"><i class="icon icon-person"></i></a>');
 
     if(typeof user === 'string') user = {account: user};
-    if(!user.avatar && window.userList && window.userList[user.account]) user = {avatar: userList[user.account].avatar, account: user.account, realname: users[user.account]};
+    if(!user.avatar && window.users && window.users[user.account]) user = {avatar: users[user.account].avatar, account: user.account, realname: users[user.account]};
 
     var $noPrivAvatar = $('<div class="avatar has-text ' + avatarSizeClass + ' avatar-circle" />').avatar({user: user});
     if(objectType == 'task'  && !priv.canAssignTask)  return $noPrivAvatar;
diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php
index 96203eba46..b4ea6625c5 100644
--- a/module/execution/view/create.html.php
+++ b/module/execution/view/create.html.php
@@ -42,6 +42,7 @@
 <?php js::set('projectCommon', $lang->project->common);?>
 <?php js::set('multiBranchProducts', $multiBranchProducts);?>
 <?php js::set('systemMode', $config->systemMode);?>
+<?php js::set('projectID', $projectID);?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>