From 336a4e59517c243d964010a5ee6c00b28663d72d Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Mon, 27 Sep 2021 15:32:22 +0800
Subject: [PATCH] * Fix bug#15368

---
 module/execution/control.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index d30352787b..b814c81170 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -2984,6 +2984,9 @@ class execution extends control
             $executionLang   = $this->lang->execution;
             $executionConfig = $this->config->execution;
 
+            $projectID = $from == 'project' ? $this->session->project : 0;
+            if($projectID) $this->project->setMenu($projectID);
+
             /* Create field lists. */
             $fields = $this->post->exportFields ? $this->post->exportFields : explode(',', $executionConfig->list->exportFields);
             foreach($fields as $key => $fieldName)
@@ -2993,7 +2996,6 @@ class execution extends control
                 unset($fields[$key]);
             }
 
-            $projectID = $from == 'project' ? $this->session->project : 0;
             $executionStats = $this->project->getStats($projectID, $status == 'byproduct' ? 'all' : $status, $productID, 0, 30, 'id_asc');
             $users = $this->loadModel('user')->getPairs('noletter');
             foreach($executionStats as $i => $execution)