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

FIX #81 Basket pages constant labels

parent 834767e4
No related branches found
No related tags found
No related merge requests found
......@@ -330,7 +330,7 @@ class BasketController
}
$allGroups = GroupModel::get(['select' => ['group_id', 'group_desc']]);
$basketPages = BasketModel::getBasketPages();
$basketPages = BasketModel::getBasketPages(['unneeded' => ['redirect_to_action']]);
return $response->withJson(['groups' => $groups, 'allGroups' => $allGroups, 'pages' => $basketPages]);
}
......
......@@ -590,8 +590,10 @@ class BasketModelAbstract
return $coloredBaskets;
}
public static function getBasketPages()
public static function getBasketPages(array $aArgs)
{
ValidatorModel::arrayType($aArgs, ['unneeded']);
$customId = CoreConfigModel::getCustomId();
if (file_exists("custom/{$customId}/modules/basket/xml/basketpage.xml")) {
$path = "custom/{$customId}/modules/basket/xml/basketpage.xml";
......@@ -604,11 +606,13 @@ class BasketModelAbstract
$loadedXml = simplexml_load_file($path);
if ($loadedXml) {
foreach ($loadedXml->BASKETPAGE as $value) {
$basketPages[] = [
'id' => (string)$value->ID,
'label' => (string)$value->LABEL,
'name' => (string)$value->NAME
];
if (empty($aArgs['unneeded']) || !in_array((string)$value->ID, $aArgs['unneeded'])) {
$basketPages[] = [
'id' => (string)$value->ID,
'label' => constant((string)$value->LABEL),
'name' => (string)$value->NAME
];
}
}
}
}
......
......@@ -63,3 +63,10 @@ define('_USER_GROUP_CREATION', 'Group added for user');
define('_USER_GROUP_MODIFICATION', 'Group updated for user');
define('_USER_GROUP_SUPPRESSION', 'Group deleted for user');
define('_VISA_USER', 'For visa');
define('_DOCUMENTS_LIST_WITH_ATTACHMENTS', 'List with filters and responses');
define('_DOCUMENTS_LIST_WITH_AVIS', 'List of documents with recommendation');
define('_DOCUMENTS_LIST_COPIES', 'List of copies');
define('_CASES_LIST', 'Cases list');
define('_DOCUMENTS_LIST_WITH_SIGNATORY', 'Documents list with signatory');
define('_FOLDERS_LIST', 'folders list');
......@@ -63,3 +63,10 @@ define('_USER_GROUP_CREATION', 'Groupe ajouté pour utilisateur');
define('_USER_GROUP_MODIFICATION', 'Groupe modifié pour utilisateur');
define('_USER_GROUP_SUPPRESSION', 'Groupe supprimé pour utilisateur');
define('_VISA_USER', 'Pour visa');
define('_DOCUMENTS_LIST_WITH_ATTACHMENTS', 'Liste avec filtre et réponses');
define('_DOCUMENTS_LIST_WITH_AVIS', 'Liste des documents avec avis');
define('_DOCUMENTS_LIST_COPIES', 'Liste des copies');
define('_CASES_LIST', 'Liste des affaires');
define('_DOCUMENTS_LIST_WITH_SIGNATORY', 'Liste des documents avec signataire');
define('_FOLDERS_LIST', 'Liste de dossiers');
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment