diff --git a/src/app/group/models/ServiceModelAbstract.php b/src/app/group/models/ServiceModelAbstract.php
index 4d4c966767f564b02f39e0e28b63e6a549903bbb..a47ade4924ce607a11827085ea552866d4323967 100755
--- a/src/app/group/models/ServiceModelAbstract.php
+++ b/src/app/group/models/ServiceModelAbstract.php
@@ -85,21 +85,23 @@ abstract class ServiceModelAbstract
$comment = defined((string) $value->comment) ? constant((string) $value->comment) : (string) $value->comment;
if (empty($category)) {
$applicationServices[] = [
- 'name' => $name,
- 'comment' => $comment,
- 'servicepage' => (string) $value->servicepage,
- 'shortcut' => empty((string)$value->shortcut) ? 'false' : (string)$value->shortcut,
- 'style' => (string) $value->style,
- 'angular' => empty((string) $value->angular) ? 'false' : (string) $value->angular,
+ 'id' => (string)$value->id,
+ 'name' => $name,
+ 'comment' => $comment,
+ 'servicepage' => (string) $value->servicepage,
+ 'shortcut' => empty((string)$value->shortcut) ? 'false' : (string)$value->shortcut,
+ 'style' => (string) $value->style,
+ 'angular' => empty((string) $value->angular) ? 'false' : (string) $value->angular,
];
} else {
$applicationServices[$category][] = [
- 'name' => $name,
- 'comment' => $comment,
- 'servicepage' => (string) $value->servicepage,
- 'shortcut' => empty((string)$value->shortcut) ? 'false' : (string)$value->shortcut,
- 'style' => (string) $value->style,
- 'angular' => empty((string) $value->angular) ? 'false' : (string) $value->angular,
+ 'id' => (string)$value->id,
+ 'name' => $name,
+ 'comment' => $comment,
+ 'servicepage' => (string) $value->servicepage,
+ 'shortcut' => empty((string)$value->shortcut) ? 'false' : (string)$value->shortcut,
+ 'style' => (string) $value->style,
+ 'angular' => empty((string) $value->angular) ? 'false' : (string) $value->angular,
];
}
}
@@ -136,21 +138,23 @@ abstract class ServiceModelAbstract
$comment = defined((string) $value->comment) ? constant((string) $value->comment) : (string) $value->comment;
if (empty($category)) {
$applicationServices[] = [
- 'name' => $name,
- 'comment' => $comment,
- 'servicepage' => (string)$value->servicepage,
- 'shortcut' => empty((string)$value->shortcut) ? 'false' : (string)$value->shortcut,
- 'style' => (string)$value->style,
- 'angular' => empty((string)$value->angular) ? 'false' : (string)$value->angular,
+ 'id' => (string)$value->id,
+ 'name' => $name,
+ 'comment' => $comment,
+ 'servicepage' => (string)$value->servicepage,
+ 'shortcut' => empty((string)$value->shortcut) ? 'false' : (string)$value->shortcut,
+ 'style' => (string)$value->style,
+ 'angular' => empty((string)$value->angular) ? 'false' : (string)$value->angular,
];
} else {
$applicationServices[$category][] = [
- 'name' => $name,
- 'comment' => $comment,
- 'servicepage' => (string)$value->servicepage,
- 'shortcut' => empty((string)$value->shortcut) ? 'false' : (string)$value->shortcut,
- 'style' => (string)$value->style,
- 'angular' => empty((string)$value->angular) ? 'false' : (string)$value->angular,
+ 'id' => (string)$value->id,
+ 'name' => $name,
+ 'comment' => $comment,
+ 'servicepage' => (string)$value->servicepage,
+ 'shortcut' => empty((string)$value->shortcut) ? 'false' : (string)$value->shortcut,
+ 'style' => (string)$value->style,
+ 'angular' => empty((string)$value->angular) ? 'false' : (string)$value->angular,
];
}
}
@@ -180,21 +184,23 @@ abstract class ServiceModelAbstract
$comment = defined((string) $value->comment) ? constant((string) $value->comment) : (string) $value->comment;
if (empty($category)) {
$modulesServices[] = [
- 'name' => $name,
- 'comment' => $comment,
- 'servicepage' => (string) $value->servicepage,
- 'shortcut' => empty((string)$value->shortcut) ? 'false' : (string)$value->shortcut,
- 'style' => (string) $value->style,
- 'angular' => empty((string) $value->angular) ? 'false' : (string) $value->angular,
+ 'id' => (string)$value->id,
+ 'name' => $name,
+ 'comment' => $comment,
+ 'servicepage' => (string) $value->servicepage,
+ 'shortcut' => empty((string)$value->shortcut) ? 'false' : (string)$value->shortcut,
+ 'style' => (string) $value->style,
+ 'angular' => empty((string) $value->angular) ? 'false' : (string) $value->angular,
];
} else {
$modulesServices[$category][] = [
- 'name' => $name,
- 'comment' => $comment,
- 'servicepage' => (string) $value->servicepage,
- 'shortcut' => empty((string)$value->shortcut) ? 'false' : (string)$value->shortcut,
- 'style' => (string) $value->style,
- 'angular' => empty((string) $value->angular) ? 'false' : (string) $value->angular,
+ 'id' => (string)$value->id,
+ 'name' => $name,
+ 'comment' => $comment,
+ 'servicepage' => (string) $value->servicepage,
+ 'shortcut' => empty((string)$value->shortcut) ? 'false' : (string)$value->shortcut,
+ 'style' => (string) $value->style,
+ 'angular' => empty((string) $value->angular) ? 'false' : (string) $value->angular,
];
}
}
@@ -226,21 +232,23 @@ abstract class ServiceModelAbstract
$comment = defined((string) $value->comment) ? constant((string) $value->comment) : (string) $value->comment;
if (empty($category)) {
$modulesServices[] = [
- 'name' => $name,
- 'comment' => $comment,
- 'servicepage' => (string) $value->servicepage,
- 'shortcut' => empty((string)$value->shortcut) ? 'false' : (string)$value->shortcut,
- 'style' => (string) $value->style,
- 'angular' => empty((string) $value->angular) ? 'false' : (string) $value->angular,
+ 'id' => (string)$value->id,
+ 'name' => $name,
+ 'comment' => $comment,
+ 'servicepage' => (string) $value->servicepage,
+ 'shortcut' => empty((string)$value->shortcut) ? 'false' : (string)$value->shortcut,
+ 'style' => (string) $value->style,
+ 'angular' => empty((string) $value->angular) ? 'false' : (string) $value->angular,
];
} else {
$modulesServices[$category][] = [
- 'name' => $name,
- 'comment' => $comment,
- 'servicepage' => (string) $value->servicepage,
- 'shortcut' => empty((string)$value->shortcut) ? 'false' : (string)$value->shortcut,
- 'style' => (string) $value->style,
- 'angular' => empty((string) $value->angular) ? 'false' : (string) $value->angular,
+ 'id' => (string)$value->id,
+ 'name' => $name,
+ 'comment' => $comment,
+ 'servicepage' => (string) $value->servicepage,
+ 'shortcut' => empty((string)$value->shortcut) ? 'false' : (string)$value->shortcut,
+ 'style' => (string) $value->style,
+ 'angular' => empty((string) $value->angular) ? 'false' : (string) $value->angular,
];
}
}
diff --git a/src/core/controllers/CoreController.php b/src/core/controllers/CoreController.php
index b07d969f8620478da79ebb6c071342af83c8bb05..8abaf921693a4d7f5ae1f541f584af27b20b3083 100644
--- a/src/core/controllers/CoreController.php
+++ b/src/core/controllers/CoreController.php
@@ -77,7 +77,7 @@ class CoreController
} else {
$menu = ServiceController::getMenuServicesByUserId(['userId' => $GLOBALS['userId']]);
foreach ($menu as $value) {
- if ($value['name'] == _INDEXING_MLB) {
+ if ($value['id'] == 'index_mlb') {
foreach ($user['groups'] as $group) {
if (GroupBasketModel::hasBasketByGroupId(['groupId' => $group['group_id'], 'basketId' => 'IndexingBasket'])) {
$user['indexingGroups'][] = ['groupId' => $group['group_id'], 'label' => $group['group_desc']];