From 718ffa25bc02667bf396ec134e6a934586bcd68e Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Thu, 16 Nov 2023 01:50:51 -0500
Subject: [PATCH] * Merge: 18.4 version's projectrelease.

---
 module/projectrelease/view/export.html.php | 3 +--
 module/projectrelease/view/view.html.php   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/module/projectrelease/view/export.html.php b/module/projectrelease/view/export.html.php
index b4b45fcaa7..14dec63431 100755
--- a/module/projectrelease/view/export.html.php
+++ b/module/projectrelease/view/export.html.php
@@ -23,13 +23,12 @@ function setDownloading()
 
 function closeWindow()
 {
-    if($.cookie('downloading') == 1 || i >= 30)
+    if($.cookie('downloading') == 1)
     {
         parent.$.closeModal();
         $.cookie('downloading', null);
         clearInterval(time);
     }
-    i ++;
 }
 </script>
 <div id='mainContent' class='main-content'>
diff --git a/module/projectrelease/view/view.html.php b/module/projectrelease/view/view.html.php
index 2007ba9285..5979a97944 100644
--- a/module/projectrelease/view/view.html.php
+++ b/module/projectrelease/view/view.html.php
@@ -46,7 +46,7 @@
           <li <?php if($type == 'leftBug') echo "class='active'"?>><a href='#leftBugs' data-toggle='tab'><?php echo html::icon($lang->icons['bug'], 'text-red') . ' ' . $lang->release->generatedBugs;?></a></li>
           <li <?php if($type == 'releaseInfo') echo "class='active'"?>><a href='#releaseInfo' data-toggle='tab'><?php echo html::icon($lang->icons['plan'], 'text-info') . ' ' . $lang->release->view;?></a></li>
           <?php if($summary or $countBugs or $countLeftBugs):?>
-          <li class='pull-right'><div><?php common::printIcon('projectrelease', 'export', '', '', 'button', '', '', "export btn-sm");?></div></li>
+          <li class='pull-right'><div><?php common::printIcon('projectrelease', 'export', "releaseID=$release->id", '', 'button', '', '', "export btn-sm");?></div></li>
           <?php endif;?>
         </ul>
         <div class='tab-content'>