diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index 44fa3b6..f45d690 100755 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -10,7 +10,7 @@ "icon": "fa fa-database", "order": 2, "from": "Organization", - "permission": { "permission": 2, "type": null, "element": null }, + "permission": { "permission": 2, "category": null, "element": null }, "parent": 0, "children": [ { @@ -26,7 +26,7 @@ "from": "Organization", "permission": { "permission": 2, - "type": null, + "category": null, "element": null }, "parent": 1004701001, @@ -43,7 +43,7 @@ "icon": null, "order": 5, "from": "Organization", - "permission": { "permission": 2, "type": null, "element": null }, + "permission": { "permission": 2, "category": null, "element": null }, "parent": 1004701001, "children": [ { @@ -57,7 +57,7 @@ "icon": null, "order": 5, "from": "Organization", - "permission": { "permission": 2, "type": null, "element": null }, + "permission": { "permission": 2, "category": null, "element": null }, "parent": 1004703001, "children": [] }, @@ -72,7 +72,7 @@ "icon": null, "order": 25, "from": "Organization", - "permission": { "permission": 4, "type": null, "element": null }, + "permission": { "permission": 4, "category": null, "element": null }, "parent": 1004703001, "children": [] } @@ -89,7 +89,7 @@ "icon": null, "order": 10, "from": "Organization", - "permission": { "permission": 2, "type": null, "element": null }, + "permission": { "permission": 2, "category": null, "element": null }, "parent": 1004701001, "children": [ { @@ -103,7 +103,7 @@ "icon": null, "order": 5, "from": "Organization", - "permission": { "permission": 2, "type": null, "element": null }, + "permission": { "permission": 2, "category": null, "element": null }, "parent": 1004704001, "children": [] }, @@ -118,7 +118,7 @@ "icon": null, "order": 25, "from": "Organization", - "permission": { "permission": 4, "type": null, "element": null }, + "permission": { "permission": 4, "category": null, "element": null }, "parent": 1004704001, "children": [] } @@ -135,7 +135,7 @@ "icon": null, "order": 20, "from": "Organization", - "permission": { "permission": 2, "type": null, "element": null }, + "permission": { "permission": 2, "category": null, "element": null }, "parent": 1004701001, "children": [ { @@ -149,7 +149,7 @@ "icon": null, "order": 5, "from": "Organization", - "permission": { "permission": 2, "type": null, "element": null }, + "permission": { "permission": 2, "category": null, "element": null }, "parent": 1004705001, "children": [] }, @@ -164,7 +164,7 @@ "icon": null, "order": 25, "from": "Organization", - "permission": { "permission": 4, "type": null, "element": null }, + "permission": { "permission": 4, "category": null, "element": null }, "parent": 1004705001, "children": [] } diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 5c8d35c..c5dcb03 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -186,7 +186,7 @@ final class ApiController extends Controller $this->createModel($request->header->account, $unit, UnitMapper::class, 'unit', $request->getOrigin()); if ($this->app->appSettings->get(null, SettingsEnum::GROUP_GENERATE_AUTOMATICALLY_UNIT)->content === '1') { - $newRequest = new HttpRequest(); + $newRequest = new HttpRequest(); $newRequest->header->account = $request->header->account; $newRequest->setData('name', 'org:unit:' . \strtolower($unit->name)); $newRequest->setData('status', GroupStatus::ACTIVE); @@ -405,7 +405,7 @@ final class ApiController extends Controller $this->createModel($request->header->account, $position, PositionMapper::class, 'position', $request->getOrigin()); if ($this->app->appSettings->get(null, SettingsEnum::GROUP_GENERATE_AUTOMATICALLY_POSITION)->content === '1') { - $newRequest = new HttpRequest(); + $newRequest = new HttpRequest(); $newRequest->header->account = $request->header->account; $newRequest->setData('name', 'org:pos:' . \strtolower($position->name)); $newRequest->setData('status', GroupStatus::ACTIVE); @@ -584,7 +584,7 @@ final class ApiController extends Controller $this->createModel($request->header->account, $department, DepartmentMapper::class, 'department', $request->getOrigin()); if ($this->app->appSettings->get(null, SettingsEnum::GROUP_GENERATE_AUTOMATICALLY_DEPARTMENT)->content === '1') { - $newRequest = new HttpRequest(); + $newRequest = new HttpRequest(); $newRequest->header->account = $request->header->account; $newRequest->setData('name', 'org:dep:' . \strtolower($department->name)); $newRequest->setData('status', GroupStatus::ACTIVE); diff --git a/Models/Department.php b/Models/Department.php index 97609f4..bffae43 100755 --- a/Models/Department.php +++ b/Models/Department.php @@ -14,7 +14,6 @@ declare(strict_types=1); namespace Modules\Organization\Models; - /** * Organization department class. * diff --git a/Models/Position.php b/Models/Position.php index ff73436..450c6d6 100755 --- a/Models/Position.php +++ b/Models/Position.php @@ -14,7 +14,6 @@ declare(strict_types=1); namespace Modules\Organization\Models; - /** * Organization position class. *