diff --git a/app/Entities/BaseHierarchyEntity.php b/app/Entities/BaseHierarchyEntity.php new file mode 100644 index 0000000..ff5ebc7 --- /dev/null +++ b/app/Entities/BaseHierarchyEntity.php @@ -0,0 +1,19 @@ +attributes['grpno']; + } + final public function getHierarchy_Order() + { + return $this->attributes['grporder']; + } + final public function getHierarchy_Depth() + { + return $this->attributes['grpdepth']; + } +} diff --git a/app/Entities/BoardConfigEntity.php b/app/Entities/BoardConfigEntity.php index 02e9b19..3459fe1 100644 --- a/app/Entities/BoardConfigEntity.php +++ b/app/Entities/BoardConfigEntity.php @@ -2,8 +2,6 @@ namespace App\Entities; -use App\Entities\BaseEntity; - class BoardConfigEntity extends BaseEntity { protected $datamap = []; diff --git a/app/Entities/BoardEntity.php b/app/Entities/BoardEntity.php index f090724..0bc53af 100644 --- a/app/Entities/BoardEntity.php +++ b/app/Entities/BoardEntity.php @@ -2,9 +2,7 @@ namespace App\Entities; -use App\Entities\BaseEntity; - -class BoardEntity extends BaseEntity +class BoardEntity extends BaseHierarchyEntity { protected $datamap = []; protected $dates = ['created_at', 'updated_at', 'deleted_at']; diff --git a/app/Entities/UserEntity.php b/app/Entities/UserEntity.php index 9f44fde..0705302 100644 --- a/app/Entities/UserEntity.php +++ b/app/Entities/UserEntity.php @@ -2,8 +2,6 @@ namespace App\Entities; -use App\Entities\BaseEntity; - class UserEntity extends BaseEntity { protected $datamap = []; diff --git a/app/Entities/UserSNSEntity.php b/app/Entities/UserSNSEntity.php index 12699d6..2c5298c 100644 --- a/app/Entities/UserSNSEntity.php +++ b/app/Entities/UserSNSEntity.php @@ -2,8 +2,6 @@ namespace App\Entities; -use App\Entities\BaseEntity; - class UserSNSEntity extends BaseEntity { protected $datamap = []; diff --git a/app/Helpers/Admin/Board_helper.php b/app/Helpers/Admin/Board_helper.php index b3f8c01..7b61ef2 100644 --- a/app/Helpers/Admin/Board_helper.php +++ b/app/Helpers/Admin/Board_helper.php @@ -94,7 +94,20 @@ function getFieldIndex_Row_BoardHelper($field, $entity, array $fieldFilters, $fi $value = $entity->$field ?: DEFAULTS['EMPTY']; switch ($field) { case 'title': - return anchor(current_url() . '/view/' . $entity->getPrimaryKey(), $value, [...$attributes, "target" => "_self"]); + return anchor( + current_url() . '/view/' . $entity->getPrimaryKey(), + $value, + [ + ...$attributes, + "style" => sprintf("padding-left:%spx", $entity->getHierarchy_Depth() * DEFAULTS['HIERARCHY_GRPDEPTH']), + "target" => "_self" + ] + ) . + anchor( + current_url() . '/reply/' . $entity->getPrimaryKey(), + ICONS["REPLY"], + ["target" => "_self"] + ); break; case 'board_file': case 'upload_file': diff --git a/app/Views/templates/admin/footer.php b/app/Views/templates/admin/footer.php index d73c017..00de4f8 100644 --- a/app/Views/templates/admin/footer.php +++ b/app/Views/templates/admin/footer.php @@ -2,11 +2,13 @@ + + +