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

[bookstack] / app / Entity.php

diff --git a/app/Entity.php b/app/Entity.php
index 6aeb66481dc436ca4654d8acd5c1ed3603d6665e..e5dd04bf28bdb01d30690c18e5b9a2b6986a7929 100644 (file)
--- a/app/Entity.php
+++ b/app/Entity.php
@@ -94,17 +94,6 @@ class Entity extends Ownable
             ->where('action', '=', $action)->count() > 0;
     }
 
             ->where('action', '=', $action)->count() > 0;
     }
 

-    /**
-     * Check if this entity has live (active) restrictions in place.
-     * @param $role_id
-     * @param $action
-     * @return bool
-     */
-    public function hasActiveRestriction($role_id, $action)
-    {
-        return $this->getRawAttribute('restricted') && $this->hasRestriction($role_id, $action);
-    }
-

     /**
      * Get the entity jointPermissions this is connected to.
      * @return \Illuminate\Database\Eloquent\Relations\MorphMany
     /**
      * Get the entity jointPermissions this is connected to.
      * @return \Illuminate\Database\Eloquent\Relations\MorphMany


@@ -176,5 +165,11 @@ class Entity extends Ownable
      */
     public function entityRawQuery(){return '';}
 
      */
     public function entityRawQuery(){return '';}
 

+    /**
+     * Get the url of this entity
+     * @param $path
+     * @return string
+     */
+    public function getUrl($path){return '/';}

 
 }
 
 }