From dd90f73bb9789bf2e935ec0b13488815aeae61c4 Mon Sep 17 00:00:00 2001
From: sunguangming <sunguangming@easycorp.ltd>
Date: Fri, 26 Jul 2024 09:07:31 +0000
Subject: [PATCH]  * [task#123519,doing,0.5h] move sendmail to mail.

---
 module/release/control.php                             | 2 +-
 module/release/model.php                               | 8 ++++----
 module/release/ui/{sendmail.html.php => mail.html.php} | 0
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename module/release/ui/{sendmail.html.php => mail.html.php} (100%)

diff --git a/module/release/control.php b/module/release/control.php
index f5803cbbb7..aefbf43226 100755
--- a/module/release/control.php
+++ b/module/release/control.php
@@ -570,7 +570,7 @@ class release extends control
             $this->release->changeStatus($releaseID, $this->post->status, $this->post->releasedDate);
             if(dao::isError()) return $this->sendError(dao::getError());
 
-            $this->loadModel('action')->create('release', $releaseID, 'published', $this->post->comment);
+            $this->loadModel('action')->create('release', $releaseID, 'published', $this->post->comment, $this->post->status);
             return $this->sendSuccess(array('load' => true, 'closeModal' => true));
         }
 
diff --git a/module/release/model.php b/module/release/model.php
index 67db11a5f6..092cde955b 100755
--- a/module/release/model.php
+++ b/module/release/model.php
@@ -708,16 +708,16 @@ class releaseModel extends model
         /* Get mail content. */
         $modulePath = $this->app->getModulePath('', 'release');
         $oldcwd     = getcwd();
-        $viewFile   = $modulePath . 'view/sendmail.html.php';
+        $viewFile   = $modulePath . 'view/mail.html.php';
         chdir($modulePath . 'view');
-        if(file_exists($modulePath . 'ext/view/sendmail.html.php'))
+        if(file_exists($modulePath . 'ext/view/mail.html.php'))
         {
-            $viewFile = $modulePath . 'ext/view/sendmail.html.php';
+            $viewFile = $modulePath . 'ext/view/mail.html.php';
             chdir($modulePath . 'ext/view');
         }
         ob_start();
         include $viewFile;
-        foreach(glob($modulePath . 'ext/view/sendmail.*.html.hook.php') as $hookFile) include $hookFile;
+        foreach(glob($modulePath . 'ext/view/mail.*.html.hook.php') as $hookFile) include $hookFile;
         $mailContent = ob_get_contents();
         ob_end_clean();
         chdir($oldcwd);
diff --git a/module/release/ui/sendmail.html.php b/module/release/ui/mail.html.php
similarity index 100%
rename from module/release/ui/sendmail.html.php
rename to module/release/ui/mail.html.php