Fix #2582 Userfollow activity click action not working

Enh: Make space membership activities clickable
humhub · Jul 29, 2017 · 0c4f031 · 0c4f031
1 parent 71155de
commit 0c4f031
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 17 deletions.
diff --git a/protected/humhub/docs/CHANGELOG.md b/protected/humhub/docs/CHANGELOG.md
@@ -48,6 +48,9 @@ HumHub Change Log
 - Enh: Added `ContentTag` concept for creating content categories/filter on module level
 - Fix: Mentioning keeps running even if previous input result was empty
 - Enh: Darkened comment links for better readability
+- Fix #2582 Userfollow activity click action not working
+- Enh: Make space membership activities clickable
+
 
 1.2.1 (June 17, 2017)
 - Fix: Invite error in french language

diff --git a/protected/humhub/modules/activity/components/BaseActivity.php b/protected/humhub/modules/activity/components/BaseActivity.php
@@ -119,7 +119,6 @@ public function about($source)
     public function container($container)
     {
         $this->record->content->container = $container;
-
         return $this;
     }
 

diff --git a/protected/humhub/modules/activity/controllers/LinkController.php b/protected/humhub/modules/activity/controllers/LinkController.php
@@ -11,8 +11,6 @@
 use Yii;
 use humhub\components\Controller;
 use humhub\modules\activity\models\Activity;
-use humhub\modules\content\components\ContentActiveRecord;
-use humhub\modules\content\components\ContentAddonActiveRecord;
 
 /**
  * LinkController provides link informations about an Activity via JSON.
@@ -43,9 +41,8 @@ public function actionIndex()
         $activityId = Yii::$app->request->get('id');
         $activity = Activity::findOne(['id' => $activityId]);
 
-        if ($activity !== null && $activity->content->canRead()) {
-            $source = $activity->getSource();
-            $this->redirect($source->content->getUrl());
+        if ($activity !== null && $activity->content->canView()) {
+            $this->redirect($activity->getActivityBaseClass()->getUrl());
         }
     }
 

diff --git a/protected/humhub/modules/space/activities/MemberAdded.php b/protected/humhub/modules/space/activities/MemberAdded.php
@@ -19,12 +19,6 @@
  */
 class MemberAdded extends BaseActivity implements ConfigurableActivityInterface
 {
-
-    /**
-     * @inheritdoc
-     */
-    public $clickable = false;
-
     /**
      * @inheritdoc
      */

diff --git a/protected/humhub/modules/space/activities/MemberRemoved.php b/protected/humhub/modules/space/activities/MemberRemoved.php
@@ -20,11 +20,6 @@
 class MemberRemoved extends BaseActivity implements ConfigurableActivityInterface
 {
 
-    /**
-     * @inheritdoc
-     */
-    public $clickable = false;
-
     /**
      * @inheritdoc
      */

diff --git a/protected/humhub/modules/user/activities/UserFollow.php b/protected/humhub/modules/user/activities/UserFollow.php
@@ -28,4 +28,12 @@ class UserFollow extends BaseActivity
      */
     public $viewName = "userFollow";
 
+    /**
+     * @inheritdoc
+     */
+    public function getUrl()
+    {
+        return $this->source->target->getUrl();
+    }
+
 }