update

Author: abude

Module.php

@@ -37,9 +37,8 @@ class Module extends \yii\base\Module
     public function init()
     {
         parent::init();
-
         if (null === $this->userIdentityClass) {
-            $this->userIdentityClass = Yii::$app->getUser()->identityClass;
+            $this->userIdentityClass = ($this->params['commentsIdentityClass']) ? $this->params['commentsIdentityClass'] : Yii::$app->getUser()->identityClass;
         }
     }
 }

README.md

@@ -14,11 +14,6 @@ This module provides a comments managing system.
 [![Build Status](https://travis-ci.org/yii2mod/yii2-comments.svg?branch=master)](https://travis-ci.org/yii2mod/yii2-comments)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/yii2mod/yii2-comments/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/yii2mod/yii2-comments/?branch=master)
 
-## Support us
-
-Does your business depend on our contributions? Reach out and support us on [Patreon](https://www.patreon.com/yii2mod). 
-All pledges will be dedicated to allocating workforce on maintenance and new awesome stuff.
-
 Installation
 ------------
 

behaviors/BlameableBehavior.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace yii2mod\comments\behaviors;
+
+use Yii;
+use yii\db\BaseActiveRecord;
+
+class BlameableBehavior extends \yii\behaviors\BlameableBehavior
+{
+	/**
+	 * {@inheritdoc}
+	 *
+	 * In case, when the [[value]] property is `null`, the value of [[defaultValue]] will be used as the value.
+	 */
+	protected function getValue($event)
+	{
+		if ($this->value === null && Yii::$app->has('customer')) {
+			$userId = Yii::$app->get('customer')->id;
+			if ($userId === null) {
+				return $this->getDefaultValue($event);
+			}
+
+			return $userId;
+		} elseif ($this->value === null) {
+			return $this->getDefaultValue($event);
+		}
+
+		return parent::getValue($event);
+	}
+}

controllers/DefaultController.php

@@ -109,7 +109,9 @@ public function actionCreate($entity)
         $event = Yii::createObject(['class' => CommentEvent::class, 'commentModel' => $commentModel]);
         $commentModel->setAttributes($this->getCommentAttributesFromEntity($entity));
         $this->trigger(self::EVENT_BEFORE_CREATE, $event);
+
         if ($commentModel->load(Yii::$app->request->post()) && $commentModel->saveComment()) {
+
             $this->trigger(self::EVENT_AFTER_CREATE, $event);
 
             return ['status' => 'success'];

models/CommentModel.php

@@ -4,7 +4,7 @@
 
 use paulzi\adjacencyList\AdjacencyListBehavior;
 use Yii;
-use yii\behaviors\BlameableBehavior;
+use yii2mod\comments\behaviors\BlameableBehavior;
 use yii\behaviors\TimestampBehavior;
 use yii\db\ActiveQuery;
 use yii\db\ActiveRecord;
@@ -220,6 +220,9 @@ public function saveComment()
      */
     public function getAuthor()
     {
+	    if (app()->getModule('comment')->params['commentsIdentityPrimaryId']) {
+		    return $this->hasOne($this->getModule()->userIdentityClass, [app()->getModule('comment')->params['commentsIdentityPrimaryId'] => 'createdBy']);
+	    }
         return $this->hasOne($this->getModule()->userIdentityClass, ['id' => 'createdBy']);
     }
 

widgets/views/_list.php

@@ -18,7 +18,7 @@
                 <?php if (Yii::$app->getUser()->can('admin')) : ?>
                     <?php echo Html::a('<span class="glyphicon glyphicon-trash"></span> ' . Yii::t('yii2mod.comments', 'Delete'), '#', ['class' => 'delete-comment-btn', 'data' => ['action' => 'delete', 'url' => Url::to(['/comment/default/delete', 'id' => $model->id]), 'comment-id' => $model->id]]); ?>
                 <?php endif; ?>
-                <?php if (!Yii::$app->user->isGuest && ($model->level < $maxLevel || is_null($maxLevel))) : ?>
+                <?php if (!Yii::$app->customer->isGuest && ($model->level < $maxLevel || is_null($maxLevel))) : ?>
                     <?php echo Html::a("<span class='glyphicon glyphicon-share-alt'></span> " . Yii::t('yii2mod.comments', 'Reply'), '#', ['class' => 'reply-comment-btn', 'data' => ['action' => 'reply', 'comment-id' => $model->id]]); ?>
                 <?php endif; ?>
             </div>

widgets/views/index.php

@@ -42,7 +42,7 @@
                 ],
                 $listViewConfig
             )); ?>
-            <?php if (!Yii::$app->user->isGuest) : ?>
+            <?php if (!Yii::$app->customer->isGuest) : ?>
                 <?php echo $this->render('_form', [
                     'commentModel' => $commentModel,
                     'formId' => $formId,