diff --git a/CHANGELOG.md b/CHANGELOG.md index 68f8eb2b63..1768eead63 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ HumHub Changelog - Fix #4628: Fixed stream gallery ratio issues on fluid themes - Fix #4636: Jplayer overflow on mobile stream - Fix #4591: Registration error text "You are already logged in!" not translatable - +- Fix #4630: Transfer default content of user approve/decline email to approve/decline form 1.7.0 (November 4, 2020) ------------------------ diff --git a/protected/humhub/modules/admin/controllers/ApprovalController.php b/protected/humhub/modules/admin/controllers/ApprovalController.php index 4499a10682..635b637aeb 100644 --- a/protected/humhub/modules/admin/controllers/ApprovalController.php +++ b/protected/humhub/modules/admin/controllers/ApprovalController.php @@ -97,6 +97,7 @@ class ApprovalController extends Controller public function actionApprove($id) { $model = new ApproveUserForm($id); + $model->setApprovalDefaults(); if($model->load(Yii::$app->request->post()) && $model->approve()) { return $this->redirect(['index']); } @@ -110,6 +111,7 @@ class ApprovalController extends Controller public function actionDecline($id) { $model = new ApproveUserForm($id); + $model->setDeclineDefaults(); if($model->load(Yii::$app->request->post()) && $model->decline()) { return $this->redirect(['index']); } diff --git a/protected/humhub/modules/admin/models/forms/ApproveUserForm.php b/protected/humhub/modules/admin/models/forms/ApproveUserForm.php index 7abbec7af0..68c5401d07 100644 --- a/protected/humhub/modules/admin/models/forms/ApproveUserForm.php +++ b/protected/humhub/modules/admin/models/forms/ApproveUserForm.php @@ -171,6 +171,7 @@ class ApproveUserForm extends \yii\base\Model ); $loginLink = Html::a(urldecode(Url::to(["/user/auth/login"], true)), Url::to(["/user/auth/login"], true)); + $loginURL = urldecode(Url::to(["/user/auth/login"], true)); $userName = Html::encode($this->user->displayName); $adminName = Html::encode($this->admin->displayName); @@ -179,6 +180,7 @@ class ApproveUserForm extends \yii\base\Model '{displayName}' => $userName, '{AdminName}' => $adminName, '{loginLink}' => $loginLink, + '{loginURL}' => $loginURL ]); } else { $this->message = static::getDefaultApprovalMessage($userName, $adminName, $loginLink);