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

N°6370 - Replace Audit Category menu by a dashboard

Browse Source
This commit is contained in:
vdumas
2023-06-05 17:57:57 +02:00
parent 8eb1053daa
commit 652a9f6e40
5 changed files with 145 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/dashlet.class.inc.php
View File

@@ -869,7 +869,7 @@ class DashletPlainText extends Dashlet
public function Render($oPage, $bEditMode = false, $aExtraParams = array())
{
$sText = $this->aProperties['text'];
$sText = utils::EscapeHtml($sText);
$sText = utils::EscapeHtml(Dict::S($sText));
$sText = str_replace(array("\r\n", "\n", "\r"), "<br/>", $sText);
$sId = 'plaintext_'.($bEditMode ? 'edit_' : '').$this->sId;

15
application/datamodel.application.xml
View File

@@ -100,11 +100,20 @@
<enable_class>URP_Profiles</enable_class>
<enable_action>UR_ACTION_MODIFY</enable_action>
</menu>
<menu id="AuditCategories" xsi:type="OQLMenuNode" _delta="define">
<menu id="AuditCategories" xsi:type="DashboardMenuNode" _delta="define">
<rank>20</rank>
<parent>AdminTools</parent>
<oql><![CDATA[SELECT AuditCategory]]></oql>
<do_search>1</do_search>
<definition>
<layout>DashboardLayoutOneCol</layout>
<title>Menu:WelcomeMenuPage</title>
<cells>
<cell id="0">
<rank>0</rank>
<dashlets>
</dashlets>
</cell>
</cells>
</definition>
<enable_class>AuditCategory</enable_class>
<enable_action>UR_ACTION_MODIFY</enable_action>
</menu>

4
core/dict.class.inc.php
View File

@@ -106,10 +106,10 @@ class Dict
}
/**
* Returns a localised string from the dictonary
* Returns a localised string from the dictionary
*
* @param string $sStringCode The code identifying the dictionary entry
* @param string $sDefault Default value if there is no match in the dictionary
* @param string $sDefault Default value if there is no match in the dictionary, if no default provided, returns $sStringCode unchanged
* @param bool $bUserLanguageOnly False to allow the use of the default language as a fallback, true otherwise
*
* @return string

85
datamodels/2.x/itop-welcome-itil/datamodel.itop-welcome-itil.xml
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1">
<menus>
<!-- Dashboard definitions cannot be defined directly in datamodel.application.xml, so they are here -->
<menu id="WelcomeMenuPage" xsi:type="DashboardMenuNode" _delta="redefine">
<rank>10</rank>
<parent>WelcomeMenu</parent>
@@ -29,5 +30,89 @@
</cells>
</definition>
</menu>
<menu id="AuditCategories" xsi:type="DashboardMenuNode" _delta="redefine">
<rank>20</rank>
<parent>AdminTools</parent>
<definition>
<layout>DashboardLayoutThreeCols</layout>
<title>Menu:AuditCategories:Title</title>
<cells>
<cell id="0">
<rank>0</rank>
<dashlets>
<dashlet id="AuditConfiguration_row0_col0_1" xsi:type="DashletPlainText">
<rank>0</rank>
<text>Class:AuditDomain+</text>
</dashlet>
<dashlet id="AuditConfiguration_row0_col0_2" xsi:type="DashletBadge">
<rank>1</rank>
<class>AuditDomain</class>
</dashlet>
</dashlets>
</cell>
<cell id="1">
<rank>1</rank>
<dashlets>
<dashlet id="AuditConfiguration_row0_col1_1" xsi:type="DashletPlainText">
<rank>0</rank>
<text>Class:AuditCategory+</text>
</dashlet>
<dashlet id="AuditConfiguration_row0_col1_2" xsi:type="DashletBadge">
<rank>1</rank>
<class>AuditCategory</class>
</dashlet>
</dashlets>
</cell>
<cell id="2">
<rank>2</rank>
<dashlets>
<dashlet id="AuditConfiguration_row0_col2_1" xsi:type="DashletPlainText">
<rank>0</rank>
<text>Class:AuditRule+</text>
</dashlet>
<dashlet id="AuditConfiguration_row0_col2_2" xsi:type="DashletBadge">
<rank>1</rank>
<class>AuditRule</class>
</dashlet>
</dashlets>
</cell>
<cell id="3">
<rank>3</rank>
<dashlets>
<dashlet id="AuditConfiguration_row1_col0_1" xsi:type="DashletObjectList">
<rank>0</rank>
<title>Class:AuditDomain</title>
<query>SELECT AuditDomain</query>
<menu>true</menu>
</dashlet>
</dashlets>
</cell>
<cell id="4">
<rank>4</rank>
<dashlets>
<dashlet id="AuditConfiguration_row1_col1_1" xsi:type="DashletObjectList">
<rank>0</rank>
<title>Class:AuditCategory</title>
<query>SELECT AuditCategory</query>
<menu>true</menu>
</dashlet>
</dashlets>
</cell>
<cell id="5">
<rank>5</rank>
<dashlets>
<dashlet id="AuditConfiguration_row1_col2_1" xsi:type="DashletObjectList">
<rank>0</rank>
<title>Class:AuditRule</title>
<query>SELECT AuditRule</query>
<menu>true</menu>
</dashlet>
</dashlets>
</cell>
</cells>
</definition>
<enable_class>AuditCategory</enable_class>
<enable_action>UR_ACTION_MODIFY</enable_action>
</menu>
</menus>
</itop_design>

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

@@ -20,22 +20,23 @@
//
Dict::Add('EN US', 'English', 'English', array(
'Class:AuditCategory' => 'Audit Category',
'Class:AuditCategory+' => 'A section inside the overall audit',
'Class:AuditCategory/Attribute:name' => 'Category Name',
'Class:AuditCategory/Attribute:name+' => 'Short name for this category',
'Class:AuditCategory/Attribute:description' => 'Audit Category Description',
'Class:AuditCategory/Attribute:description+' => 'Long description for this audit category',
'Class:AuditCategory/Attribute:definition_set' => 'Definition Set',
'Class:AuditCategory/Attribute:definition_set+' => 'OQL expression defining the set of objects to audit',
'Class:AuditCategory/Attribute:rules_list' => 'Audit Rules',
'Class:AuditCategory/Attribute:rules_list+' => 'Audit rules for this category',
'Class:AuditCategory/Attribute:ok_error_tolerance' => 'Error tolerance (OK)',
'Class:AuditCategory/Attribute:ok_error_tolerance+' => 'Allowed percentage of invalid objects at which the result is still displayed as OK (green)',
'Class:AuditCategory/Attribute:warning_error_tolerance' => 'Error tolerance (warning)',
'Class:AuditCategory/Attribute:warning_error_tolerance+' => 'Allowed percentage of invalid objects at which the result is still displayed as a warning (orange)',
'Class:AuditCategory/Attribute:domains_list' => 'Domains',
'Class:AuditCategory/Attribute:domains_list+' => 'List of domains linked to this category',
'Class:AuditCategory' => 'Audit Category',
'Class:AuditCategory+' => 'Audit category defines a scope of objects which needs to be audited.
It groups all audit rules applying to that object scope',
'Class:AuditCategory/Attribute:name' => 'Category Name',
'Class:AuditCategory/Attribute:name+' => 'Identify a scope of objects to audit',
'Class:AuditCategory/Attribute:description' => 'Description',
'Class:AuditCategory/Attribute:description+' => 'Long description for this audit category',
'Class:AuditCategory/Attribute:definition_set' => 'Object scope',
'Class:AuditCategory/Attribute:definition_set+' => 'OQL query defining the set of objects to audit',
'Class:AuditCategory/Attribute:rules_list' => 'Audit rules',
'Class:AuditCategory/Attribute:rules_list+' => 'Audit rules using the object scope of this category',
'Class:AuditCategory/Attribute:ok_error_tolerance' => 'Warning threshold',
'Class:AuditCategory/Attribute:ok_error_tolerance+' => 'Percentage of invalid objects below which the result is a warning (orange)',
'Class:AuditCategory/Attribute:warning_error_tolerance' => 'Error threshold',
'Class:AuditCategory/Attribute:warning_error_tolerance+' => 'Percentage of invalid objects below which the result is in error (red)',
'Class:AuditCategory/Attribute:domains_list' => 'Domains',
'Class:AuditCategory/Attribute:domains_list+' => 'Domains which includes this category',
));
//
@@ -43,27 +44,27 @@ Dict::Add('EN US', 'English', 'English', array(
//
Dict::Add('EN US', 'English', 'English', array(
'Class:AuditRule' => 'Audit Rule',
'Class:AuditRule+' => 'A rule to check for a given Audit category',
'Class:AuditRule/Attribute:name' => 'Rule Name',
'Class:AuditRule/Attribute:name+' => 'Short name for this rule',
'Class:AuditRule/Attribute:description' => 'Audit Rule Description',
'Class:AuditRule/Attribute:description+' => 'Long description for this audit rule',
'Class:TagSetFieldData/Attribute:finalclass' => 'Tag class',
'Class:TagSetFieldData/Attribute:obj_class' => 'Object class',
'Class:TagSetFieldData/Attribute:obj_attcode' => 'Field code',
'Class:AuditRule/Attribute:query' => 'Query to Run',
'Class:AuditRule/Attribute:query+' => 'The OQL expression to run',
'Class:AuditRule/Attribute:valid_flag' => 'Valid objects?',
'Class:AuditRule/Attribute:valid_flag+' => 'True if the rule returns the valid objects, false otherwise',
'Class:AuditRule/Attribute:valid_flag/Value:true' => 'true',
'Class:AuditRule/Attribute:valid_flag/Value:true+' => 'true',
'Class:AuditRule/Attribute:valid_flag/Value:false' => 'false',
'Class:AuditRule/Attribute:valid_flag/Value:false+' => 'false',
'Class:AuditRule/Attribute:category_id' => 'Category',
'Class:AuditRule/Attribute:category_id+' => 'The category for this rule',
'Class:AuditRule/Attribute:category_name' => 'Category',
'Class:AuditRule/Attribute:category_name+' => 'Name of the category for this rule',
'Class:AuditRule' => 'Audit Rule',
'Class:AuditRule+' => 'An audit rule corresponds a single check within an audit category.
It is applied on the scope of objects defined by the audit category',
'Class:AuditRule/Attribute:name' => 'Rule name',
'Class:AuditRule/Attribute:name+' => 'Short name for this rule',
'Class:AuditRule/Attribute:description' => 'Description',
'Class:AuditRule/Attribute:description+' => 'What is checked? How should it be fixed? Who should do it? ...',
'Class:AuditRule/Attribute:query' => 'Query to run',
'Class:AuditRule/Attribute:query+' => 'The OQL expression to run. Returned classes must be aligned with those of the category\'s scope',
'Class:AuditRule/Attribute:valid_flag' => 'Returned objects: ',
'Class:AuditRule/Attribute:valid_flag+' => 'Does the query to run returns valid or invalid objects?
"Valid objects": then objects in error are those part of the scope and not in the list of valid objects,
"Invalid objects": then objects in error are the invalid objects which are part of the scope',
'Class:AuditRule/Attribute:valid_flag/Value:true' => 'Valid objects',
'Class:AuditRule/Attribute:valid_flag/Value:true+' => 'Then objects in error are those part of the scope and not in the list of valid objects',
'Class:AuditRule/Attribute:valid_flag/Value:false' => 'Invalid objects',
'Class:AuditRule/Attribute:valid_flag/Value:false+' => 'Then objects in error are the invalid objects which are part of the scope',
'Class:AuditRule/Attribute:category_id' => 'Category',
'Class:AuditRule/Attribute:category_id+' => 'The category of this rule',
'Class:AuditRule/Attribute:category_name' => 'Category name',
'Class:AuditRule/Attribute:category_name+' => 'Name of the category of this rule',
));
//
@@ -72,7 +73,8 @@ Dict::Add('EN US', 'English', 'English', array(
Dict::Add('EN US', 'English', 'English', array(
'Class:AuditDomain' => 'Audit Domain',
'Class:AuditDomain+' => '',
'Class:AuditDomain+' => 'Audit domains allow to group the audit categories.
Domain usually correspond to who is responsible for checking and fixing errors',
'Class:AuditDomain/Attribute:name' => 'Name',
'Class:AuditDomain/Attribute:name+' => 'Its a segmentation of the Audit by who is in charge of fixing it or just interested',
'Class:AuditDomain/Attribute:description' => 'Description',
@@ -80,7 +82,7 @@ Dict::Add('EN US', 'English', 'English', array(
'Class:AuditDomain/Attribute:icon' => 'Icon',
'Class:AuditDomain/Attribute:icon+' => '',
'Class:AuditDomain/Attribute:categories_list' => 'Categories',
'Class:AuditDomain/Attribute:categories_list+' => 'Linked audit categories',
'Class:AuditDomain/Attribute:categories_list+' => 'Related audit categories. When running the audit on a domain, all related audit categories are checked and only those.',
));
//
@@ -1102,37 +1104,6 @@ When associated with a trigger, each action is given an "order" number, specifyi
'UI:TagAdminMenu:NoTags' => 'No Tag field configured',
'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...)
'Menu:Notifications:Title' => 'Audit Categories',// Duplicated into itop-welcome-itil (will be removed from here...)
'Menu:RunQueriesMenu' => 'Run Queries',// Duplicated into itop-welcome-itil (will be removed from here...)
'Menu:RunQueriesMenu+' => 'Run any query',// Duplicated into itop-welcome-itil (will be removed from here...)
'Menu:QueryMenu' => 'Query phrasebook',// Duplicated into itop-welcome-itil (will be removed from here...)
'Menu:QueryMenu+' => 'Query phrasebook',// Duplicated into itop-welcome-itil (will be removed from here...)
'Menu:DataAdministration' => 'Data Administration',// Duplicated into itop-welcome-itil (will be removed from here...)
'Menu:DataAdministration+' => 'Data Administration',// Duplicated into itop-welcome-itil (will be removed from here...)
'Menu:UniversalSearchMenu' => 'Universal Search',// Duplicated into itop-welcome-itil (will be removed from here...)
'Menu:UniversalSearchMenu+' => 'Search for anything...',// Duplicated into itop-welcome-itil (will be removed from here...)
'Menu:UserManagementMenu' => 'User Management',// Duplicated into itop-welcome-itil (will be removed from here...)
'Menu:UserManagementMenu+' => 'User management',// Duplicated into itop-welcome-itil (will be removed from here...)
'Menu:ProfilesMenu' => 'Profiles',// Duplicated into itop-welcome-itil (will be removed from here...)
'Menu:ProfilesMenu+' => 'Profiles',// Duplicated into itop-welcome-itil (will be removed from here...)
'Menu:ProfilesMenu:Title' => 'Profiles',
// Duplicated into itop-welcome-itil (will be removed from here...)
'Menu:UserAccountsMenu' => 'User accounts',
// Duplicated into itop-welcome-itil (will be removed from here...)
'Menu:UserAccountsMenu+' => 'User accounts',
// Duplicated into itop-welcome-itil (will be removed from here...)
'Menu:UserAccountsMenu:Title' => 'User accounts',
// Duplicated into itop-welcome-itil (will be removed from here...)
'UI:iTopVersion:Short' => '%1$s version %2$s',
'UI:iTopVersion:Long' => '%1$s version %2$s-%3$s built on %4$s',
'UI:PropertiesTab' => 'Properties',
@@ -1748,9 +1719,10 @@ Dict::Add('EN US', 'English', 'English', array(
'Menu:ExportMenu+' => 'Export the results of any query in HTML, CSV or XML',
'Menu:NotificationsMenu' => 'Notifications',
'Menu:NotificationsMenu+' => 'Configure notifications',
'Menu:AuditCategories' => 'Audit categories',
'Menu:AuditCategories' => 'Audit',
'Menu:AuditCategories+' => 'Define new audits',
'Menu:Notifications:Title' => 'Audit categories',
'Menu:AuditCategories:Title' => 'Audit configuration',
// 'Menu:Notifications:Title' => 'Audit categories', // code and label aren't coherent! Is it used?
'Menu:RunQueriesMenu' => 'Run queries',
'Menu:RunQueriesMenu+' => 'Write and execute any OQL query',
'Menu:QueryMenu' => 'Query phrasebook',
@@ -1769,4 +1741,5 @@ Dict::Add('EN US', 'English', 'English', array(
'Menu:UserManagement' => 'User management',
'Menu:Queries' => 'Queries',
'Menu:ConfigurationTools' => 'Configuration',
));