From 72a8881f1a5bf78143aadf19f154515b669f4e6b Mon Sep 17 00:00:00 2001 From: Lucas Bartholemy Date: Wed, 23 Sep 2015 12:57:19 +0200 Subject: [PATCH] Fixed #1205: Space remove member broken --- .../modules/space/controllers/AdminController.php | 12 ++++++------ .../humhub/modules/space/views/admin/members.php | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/protected/humhub/modules/space/controllers/AdminController.php b/protected/humhub/modules/space/controllers/AdminController.php index db1af03954..3fa803dab9 100644 --- a/protected/humhub/modules/space/controllers/AdminController.php +++ b/protected/humhub/modules/space/controllers/AdminController.php @@ -201,18 +201,18 @@ class AdminController extends \humhub\modules\content\components\ContentContaine { $this->forcePostRequest(); - $workspace = $this->getSpace(); + $space = $this->getSpace(); $userGuid = Yii::$app->request->get('userGuid'); - $user = User::model()->findByAttributes(array('guid' => $userGuid)); + $user = User::findOne(array('guid' => $userGuid)); - if ($workspace->isSpaceOwner($user->id)) { - throw new CHttpException(500, 'Owner cannot be removed!'); + if ($space->isSpaceOwner($user->id)) { + throw new HttpException(500, 'Owner cannot be removed!'); } - $workspace->removeMember($user->id); + $space->removeMember($user->id); // Redirect back to Administration page - $this->htmlRedirect($this->createUrl('//space/admin/members', array('sguid' => $workspace->guid))); + return $this->htmlRedirect($space->createUrl('/space/admin/members')); } /** diff --git a/protected/humhub/modules/space/views/admin/members.php b/protected/humhub/modules/space/views/admin/members.php index d2f7712cd5..3300bf6179 100644 --- a/protected/humhub/modules/space/views/admin/members.php +++ b/protected/humhub/modules/space/views/admin/members.php @@ -129,7 +129,7 @@ use humhub\modules\space\models\Space; 'buttonFalse' => Yii::t('SpaceModule.views_admin_members', 'No, cancel'), 'cssClass' => 'btn btn-sm btn-danger', 'linkContent' => Yii::t('SpaceModule.views_admin_members', 'Remove'), - 'linkHref' => $space->createUrl('//space/admin/removeMember', array('userGuid' => $user->guid, 'ajax' => 1)) + 'linkHref' => $space->createUrl('/space/admin/remove-member', array('userGuid' => $user->guid, 'ajax' => 1)) )); ?>