Dan Brown

Started base work on attribute system

<?php namespace BookStack;
/**
* Class Attribute
* @package BookStack
*/
class Attribute extends Model
{
protected $fillable = ['name', 'value'];
/**
* Get the entity that this attribute belongs to
* @return \Illuminate\Database\Eloquent\Relations\MorphTo
*/
public function entity()
{
return $this->morphTo('entity');
}
}
\ No newline at end of file
......@@ -55,6 +55,15 @@ abstract class Entity extends Ownable
}
/**
* Get the Attribute models that have been user assigned to this entity.
* @return \Illuminate\Database\Eloquent\Relations\MorphMany
*/
public function attributes()
{
return $this->morphMany(Attribute::class, 'entity');
}
/**
* Get this entities restrictions.
*/
public function permissions()
......@@ -115,6 +124,22 @@ abstract class Entity extends Ownable
}
/**
* Get an instance of an entity of the given type.
* @param $type
* @return Entity
*/
public static function getEntityInstance($type)
{
$types = ['Page', 'Book', 'Chapter'];
$className = str_replace([' ', '-', '_'], '', ucwords($type));
if (!in_array($className, $types)) {
return null;
}
return app('BookStack\\' . $className);
}
/**
* Gets a limited-length version of the entities name.
* @param int $length
* @return string
......
<?php namespace BookStack\Http\Controllers;
use BookStack\Repos\AttributeRepo;
use Illuminate\Http\Request;
use BookStack\Http\Requests;
class AttributeController extends Controller
{
protected $attributeRepo;
/**
* AttributeController constructor.
* @param $attributeRepo
*/
public function __construct(AttributeRepo $attributeRepo)
{
$this->attributeRepo = $attributeRepo;
}
/**
* Get all the Attributes for a particular entity
* @param $entityType
* @param $entityId
*/
public function getForEntity($entityType, $entityId)
{
}
}
......@@ -80,11 +80,16 @@ Route::group(['middleware' => 'auth'], function () {
Route::delete('/{imageId}', 'ImageController@destroy');
});
// Ajax routes
// AJAX routes
Route::put('/ajax/page/{id}/save-draft', 'PageController@saveDraft');
Route::get('/ajax/page/{id}', 'PageController@getPageAjax');
Route::delete('/ajax/page/{id}', 'PageController@ajaxDestroy');
// Attribute routes (AJAX)
Route::group(['prefix' => 'ajax/attributes'], function() {
Route::get('/get/{entityType}/{entityId}', 'AttributeController@getForEntity');
});
// Links
Route::get('/link/{id}', 'PageController@redirectFromLink');
......
<?php namespace BookStack\Repos;
use BookStack\Attribute;
use BookStack\Entity;
use BookStack\Services\PermissionService;
/**
* Class AttributeRepo
* @package BookStack\Repos
*/
class AttributeRepo
{
protected $attribute;
protected $entity;
protected $permissionService;
/**
* AttributeRepo constructor.
* @param Attribute $attr
* @param Entity $ent
* @param PermissionService $ps
*/
public function __construct(Attribute $attr, Entity $ent, PermissionService $ps)
{
$this->attribute = $attr;
$this->entity = $ent;
$this->permissionService = $ps;
}
}
\ No newline at end of file
......@@ -400,9 +400,7 @@ class PermissionService
}
});
if ($this->isAdmin) return $query;
$this->currentAction = $action;
return $this->entityRestrictionQuery($query);
return $this->enforceEntityRestrictions($query, $action);
}
/**
......@@ -413,9 +411,7 @@ class PermissionService
*/
public function enforceChapterRestrictions($query, $action = 'view')
{
if ($this->isAdmin) return $query;
$this->currentAction = $action;
return $this->entityRestrictionQuery($query);
return $this->enforceEntityRestrictions($query, $action);
}
/**
......@@ -426,6 +422,17 @@ class PermissionService
*/
public function enforceBookRestrictions($query, $action = 'view')
{
$this->enforceEntityRestrictions($query, $action);
}
/**
* Add restrictions for a generic entity
* @param $query
* @param string $action
* @return mixed
*/
public function enforceEntityRestrictions($query, $action = 'view')
{
if ($this->isAdmin) return $query;
$this->currentAction = $action;
return $this->entityRestrictionQuery($query);
......
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class CreateAttributesTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('attributes', function (Blueprint $table) {
$table->increments('id');
$table->integer('entity_id');
$table->string('entity_type', 100);
$table->string('name');
$table->string('value');
$table->timestamps();
$table->index('name');
$table->index('value');
$table->index(['entity_id', 'entity_type']);
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::drop('attributes');
}
}