composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix error on Tag Admin screen when no TagSet attribute is defined

Browse Source
This commit is contained in:
Eric
2018-10-23 14:22:59 +02:00
parent 098b0531d8
commit de86f71c90
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dictionaries/en.dictionary.itop.ui.php
View File

@@ -962,6 +962,7 @@ When associated with a trigger, each action is given an "order" number, specifyi
'Menu:TagAdminMenu' => 'Tags configuration', 'Menu:TagAdminMenu' => 'Tags configuration',
'Menu:TagAdminMenu+' => 'Tags values management', 'Menu:TagAdminMenu+' => 'Tags values management',
'UI:TagAdminMenu:Title' => 'Tags configuration', 'UI:TagAdminMenu:Title' => 'Tags configuration',
'UI:TagAdminMenu:NoTags' => 'No Tag field configured',
'UI:TagSetFieldData:Error' => 'Error: %1$s', 'UI:TagSetFieldData:Error' => 'Error: %1$s',
'Menu:AuditCategories' => 'Audit Categories', // Duplicated into itop-welcome-itil (will be removed from here...) 'Menu:AuditCategories' => 'Audit Categories', // Duplicated into itop-welcome-itil (will be removed from here...)

1
dictionaries/fr.dictionary.itop.ui.php
View File

@@ -1359,6 +1359,7 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
'Menu:TagAdminMenu' => 'Etiquettes', 'Menu:TagAdminMenu' => 'Etiquettes',
'Menu:TagAdminMenu+' => 'Gestion des étiquettes', 'Menu:TagAdminMenu+' => 'Gestion des étiquettes',
'UI:TagAdminMenu:Title' => 'Gestion des étiquettes', 'UI:TagAdminMenu:Title' => 'Gestion des étiquettes',
'UI:TagAdminMenu:NoTags' => 'Pas de champ étiquette configuré',
'UI:TagSetFieldData:Error' => 'Erreur: %1$s', 'UI:TagSetFieldData:Error' => 'Erreur: %1$s',
)); ));

8
pages/tagadmin.php
View File

@@ -105,7 +105,7 @@ try
$oP->P("<b>".Dict::Format('UI:TagSetFieldData:Error', $e->getHtmlDesc())."</b>"); $oP->P("<b>".Dict::Format('UI:TagSetFieldData:Error', $e->getHtmlDesc())."</b>");
} }
if ($oFilter != null) if (!empty($oFilter))
{ {
$oSet = new CMDBObjectSet($oFilter); $oSet = new CMDBObjectSet($oFilter);
$oBlock = new DisplayBlock($oFilter, 'search', false); $oBlock = new DisplayBlock($oFilter, 'search', false);
@@ -125,6 +125,12 @@ try
$sFilter = $oFilter->ToOQL(); $sFilter = $oFilter->ToOQL();
$oP->add("\n<!-- $sFilter -->\n"); $oP->add("\n<!-- $sFilter -->\n");
} }
else
{
$oP->add("<p>");
$oP->add(Dict::S('UI:TagAdminMenu:NoTags'));
$oP->add("</p>");
}
$oP->add("</div>\n"); $oP->add("</div>\n");
$oP->output(); $oP->output();