Skip to content
Snippets Groups Projects
Verified Commit 9c1998b8 authored by Damien's avatar Damien
Browse files

FEAT #8425 Id for services

parent 5919cafe
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/app/group/models/ServiceModelAbstract.php
+ 56
− 48
View file @ 9c1998b8
......@@ -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,
];
}
}
......
src/core/controllers/CoreController.php
+ 1
− 1
View file @ 9c1998b8
......@@ -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']];
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment