Fix message on decline multiple users (#5683)

humhub · May 5, 2022 · 513e0e7 · 513e0e7
1 parent 60f841b
commit 513e0e7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@ HumHub Changelog
 - Fix #5660: Individual modules marked with "Official" label in Marketplace
 - Fix #5657: Fix links of user counters in container headers
 - Fix #5676: Use 404 page for deleted content request
+- Fix #5679: Fix message on decline multiple users
 
 
 1.11.1 (April 22, 2022)

diff --git a/protected/humhub/modules/admin/controllers/ApprovalController.php b/protected/humhub/modules/admin/controllers/ApprovalController.php
@@ -28,7 +28,7 @@ class ApprovalController extends Controller
     public $adminOnly = false;
 
     public const ACTION_APPROVE = 'approve';
-    public const ACTION_DELINE = 'decline';
+    public const ACTION_DECLINE = 'decline';
 
     public const USER_SETTINGS_SCREEN_KEY = 'admin_approval_screen_profile_fields_id';
 
@@ -191,7 +191,7 @@ public function actionBulkActions()
         if ($action === self::ACTION_APPROVE && $model->bulkApprove()) {
             $this->view->success(Yii::t('AdminModule.user', 'The registrations were approved and the users were notified by email.'));
             return $this->redirect(['index']);
-        } elseif ($action === self::ACTION_DELINE && $model->bulkDecline()) {
+        } elseif ($action === self::ACTION_DECLINE && $model->bulkDecline()) {
             $this->view->success(Yii::t('AdminModule.user', 'The registrations were declined and the users were notified by email.'));
             return $this->redirect(['index']);
         } else {

diff --git a/protected/humhub/modules/admin/models/forms/ApproveUserForm.php b/protected/humhub/modules/admin/models/forms/ApproveUserForm.php
@@ -213,7 +213,7 @@ public function bulkDecline()
 
         foreach ($this->users as $user) {
             $this->user = $user;
-            $this->setApprovalDefaults();
+            $this->setDeclineDefaults();
             $this->decline();
         }
 

diff --git a/protected/humhub/modules/admin/views/approval/index.php b/protected/humhub/modules/admin/views/approval/index.php
@@ -123,7 +123,7 @@
         });
         $('.bulk-actions-button-decline').on('click', function () {
             $('#admin-approval-form').find("input[name='action']").remove();
-            $('#admin-approval-form').append('<input type="hidden" name="action" value="<?= ApprovalController::ACTION_DELINE ?>" />');
+            $('#admin-approval-form').append('<input type="hidden" name="action" value="<?= ApprovalController::ACTION_DECLINE ?>" />');
             //$('#admin-approval-form').submit();
         });