ensure admin user component exists #231

luyadev · Oct 10, 2018 · 9c3d828 · 9c3d828
1 parent 7627fbd
commit 9c3d828
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/src/behaviors/LogBehavior.php b/src/behaviors/LogBehavior.php
@@ -44,6 +44,21 @@ private function toJson($array)
 
  return Json::encode($array);
  }
+
+ /**
+ * Returns the user id for the current admin user if logged in and component is existsi.
+ *
+ * @return integer
+ * @since 1.2.3
+ */
+ protected function getUserId()
+ {
+ if (Yii::$app->has('adminuser') && Yii::$app->adminuser->getIdentity()) {
+ return Yii::$app->adminuser->id;
+ }
+
+ return 0;
+ }
 
  /**
  * After delete event.
@@ -54,7 +69,7 @@ public function eventAfterDelete($event)
  {
  if (Yii::$app instanceof Application) {
  Yii::$app->db->createCommand()->insert('admin_ngrest_log', [
- 'user_id' => is_null(Yii::$app->adminuser->getIdentity()) ? 0 : Yii::$app->adminuser->getId(),
+ 'user_id' => $this->getUserId(),
  'timestamp_create' => time(),
  'route' => $this->route,
  'api' => $this->api,
@@ -77,7 +92,7 @@ public function eventAfterInsert($event)
  {
  if (Yii::$app instanceof Application) {
  Yii::$app->db->createCommand()->insert('admin_ngrest_log', [
- 'user_id' => is_null(Yii::$app->adminuser->getIdentity()) ? 0 : Yii::$app->adminuser->getId(),
+ 'user_id' => $this->getUserId(),
  'timestamp_create' => time(),
  'route' => $this->route,
  'api' => $this->api,
@@ -100,7 +115,7 @@ public function eventAfterUpdate($event)
  {
  if (Yii::$app instanceof Application) {
  Yii::$app->db->createCommand()->insert('admin_ngrest_log', [
- 'user_id' => is_null(Yii::$app->adminuser->getIdentity()) ? 0 : Yii::$app->adminuser->getId(),
+ 'user_id' => $this->getUserId(),
  'timestamp_create' => time(),
  'route' => $this->route,
  'api' => $this->api,