Merge pull request #3 from OsmosysSoftware/revert-1-issue-181

[bookstack] / app / Activity.php

diff --git a/app/Activity.php b/app/Activity.php
index 64dd2351816052181b8064298a319f5ad510aa14..af386700afe2ab3d7081d12018bff8acca5c3bc0 100644 (file)
--- a/app/Activity.php
+++ b/app/Activity.php
@@ -1,29 +1,32 @@
 <?php
 
 <?php
 

-namespace Oxbow;
-
-use Illuminate\Database\Eloquent\Model;
+namespace BookStack;

 
 /**
 
 /**

- * @property string key
- * @property \User user
+ * @property string  key
+ * @property \User   user

  * @property \Entity entity
  * @property \Entity entity

- * @property string extra
+ * @property string  extra

  */
 class Activity extends Model
 {
  */
 class Activity extends Model
 {

+
+    /**
+     * Get the entity for this activity.
+     */

     public function entity()
     {
     public function entity()
     {

-        if($this->entity_id) {
-            return $this->morphTo('entity')->first();
-        } else {
-            return false;
-        }
+        if ($this->entity_type === '') $this->entity_type = null;
+        return $this->morphTo('entity');

     }
 
     }
 

+    /**
+     * Get the user this activity relates to.
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */

     public function user()
     {
     public function user()
     {

-        return $this->belongsTo('Oxbow\User');
+        return $this->belongsTo(User::class);

     }
 
     /**
     }
 
     /**


@@ -35,4 +38,13 @@ class Activity extends Model
         return trans('activities.' . $this->key);
     }
 
         return trans('activities.' . $this->key);
     }
 

+    /**
+     * Checks if another Activity matches the general information of another.
+     * @param $activityB
+     * @return bool
+     */
+    public function isSimilarTo($activityB) {
+        return [$this->key, $this->entity_type, $this->entity_id] === [$activityB->key, $activityB->entity_type, $activityB->entity_id];
+    }
+

 }
 }