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

Set default search criteria for objects + index on ticket's ref.

Browse Source 
SVN:trunk[5648]
This commit is contained in:
Vincent Dumas
2018-04-12 15:38:18 +00:00
parent f71bf1416c
commit 6d86bd516b
9 changed files with 351 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
<?php
// Copyright (C) 2010-2017 Combodo SARL
// Copyright (C) 2010-2018 Combodo SARL
//
// This file is part of iTop.
//

4
application/audit.rule.class.inc.php
View File

@@ -57,8 +57,8 @@ class AuditRule extends cmdbAbstractObject
MetaModel::Init_SetZListItems('details', array('category_id', 'name', 'description', 'query', 'valid_flag')); // Attributes to be displayed for the complete details
MetaModel::Init_SetZListItems('list', array('category_id', 'description', 'valid_flag')); // Attributes to be displayed for a list
// Search criteria
MetaModel::Init_SetZListItems('standard_search', array('category_id', 'name', 'description', 'valid_flag')); // Criteria of the std search form
MetaModel::Init_SetZListItems('advanced_search', array('category_id', 'name', 'description', 'valid_flag', 'query')); // Criteria of the advanced search form
MetaModel::Init_SetZListItems('standard_search', array('category_id', 'name', 'description', 'valid_flag', 'query')); // Criteria of the std search form
MetaModel::Init_SetZListItems('default_search', array('name', 'description', 'category_id')); // Criteria of the advanced search form
}
}
?>

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

@@ -116,8 +116,8 @@ abstract class TriggerOnObject extends Trigger
MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'filter', 'action_list')); // Attributes to be displayed for the complete details
MetaModel::Init_SetZListItems('list', array('finalclass', 'target_class', 'description')); // Attributes to be displayed for a list
// Search criteria
// MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
// MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
MetaModel::Init_SetZListItems('default_search', array('description', 'target_class')); // Default criteria of the search banner
// MetaModel::Init_SetZListItems('standard_search', array('name', 'target_class', 'description')); // Criteria of the search form
}
public function DoCheckToWrite()

3
core/userrights.class.inc.php
View File

@@ -199,7 +199,8 @@ abstract class User extends cmdbAbstractObject
MetaModel::Init_SetZListItems('details', array('contactid', 'org_id', 'email', 'login', 'language', 'status', 'profile_list', 'allowed_org_list')); // Unused as it's an abstract class !
MetaModel::Init_SetZListItems('list', array('finalclass', 'first_name', 'last_name', 'status', 'org_id')); // Attributes to be displayed for a list
// Search criteria
MetaModel::Init_SetZListItems('standard_search', array('login', 'contactid', 'status', 'org_id')); // Criteria of the std search form
MetaModel::Init_SetZListItems('standard_search', array('login', 'contactid', 'email', 'language', 'status', 'org_id')); // Criteria of the std search form
MetaModel::Init_SetZListItems('default_search', array('login', 'contactid', 'org_id')); // Default criteria of the search banner
}
abstract public function CheckCredentials($sPassword);

236
datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
View File

@@ -82,6 +82,13 @@
</item>
</items>
</details>
<default_search>
<items>
<item id="name">
<rank>10</rank>
</item>
</items>
</default_search>
<search>
<items>
<item id="name">
@@ -234,6 +241,19 @@
</item>
</items>
</details>
<default_search>
<items>
<item id="name">
<rank>10</rank>
</item>
<item id="country">
<rank>20</rank>
</item>
<item id="org_id">
<rank>30</rank>
</item>
</items>
</default_search>
<search>
<items>
<item id="name">
@@ -423,7 +443,7 @@
<item id="friendlyname">
<rank>10</rank>
</item>
<item id="status">
<item id="email">
<rank>20</rank>
</item>
<item id="org_id">
@@ -1018,6 +1038,19 @@
</item>
</items>
</details>
<default_search>
<items>
<item id="name">
<rank>10</rank>
</item>
<item id="description">
<rank>20</rank>
</item>
<item id="org_id">
<rank>30</rank>
</item>
</items>
</default_search>
<search>
<items>
<item id="name">
@@ -1538,6 +1571,16 @@
</item>
</items>
</details>
<default_search>
<items>
<item id="friendlyname">
<rank>10</rank>
</item>
<item id="org_id">
<rank>30</rank>
</item>
</items>
</default_search>
<search>
<items>
<item id="name">
@@ -1809,6 +1852,19 @@
</item>
</items>
</details>
<default_search>
<items>
<item id="friendlyname">
<rank>10</rank>
</item>
<item id="location_id">
<rank>20</rank>
</item>
<item id="org_id">
<rank>30</rank>
</item>
</items>
</default_search>
<search>
<items>
<item id="name">
@@ -2253,6 +2309,19 @@
</item>
</items>
</details>
<default_search>
<items>
<item id="friendlyname">
<rank>10</rank>
</item>
<item id="managementip">
<rank>20</rank>
</item>
<item id="org_id">
<rank>30</rank>
</item>
</items>
</default_search>
<search>
<items>
<item id="name">
@@ -3345,6 +3414,19 @@
</item>
</items>
</details>
<default_search>
<items>
<item id="friendlyname">
<rank>10</rank>
</item>
<item id="system_id">
<rank>20</rank>
</item>
<item id="org_id">
<rank>30</rank>
</item>
</items>
</default_search>
<search>
<items>
<item id="name">
@@ -4134,6 +4216,19 @@
</item>
</items>
</details>
<default_search>
<items>
<item id="friendlyname">
<rank>10</rank>
</item>
<item id="middleware_id">
<rank>20</rank>
</item>
<item id="org_id">
<rank>30</rank>
</item>
</items>
</default_search>
<search>
<items>
<item id="name">
@@ -4254,6 +4349,19 @@
</item>
</items>
</details>
<default_search>
<items>
<item id="friendlyname">
<rank>10</rank>
</item>
<item id="dbserver_id">
<rank>20</rank>
</item>
<item id="org_id">
<rank>30</rank>
</item>
</items>
</default_search>
<search>
<items>
<item id="name">
@@ -4383,6 +4491,19 @@
</item>
</items>
</details>
<default_search>
<items>
<item id="friendlyname">
<rank>10</rank>
</item>
<item id="webserver_id">
<rank>20</rank>
</item>
<item id="org_id">
<rank>30</rank>
</item>
</items>
</default_search>
<search>
<items>
<item id="name">
@@ -4540,6 +4661,19 @@
</item>
</items>
</details>
<default_search>
<items>
<item id="name">
<rank>10</rank>
</item>
<item id="vendor">
<rank>20</rank>
</item>
<item id="type">
<rank>30</rank>
</item>
</items>
</default_search>
<search>
<items>
<item id="name">
@@ -4629,6 +4763,16 @@
</item>
</items>
</details>
<default_search>
<items>
<item id="name">
<rank>10</rank>
</item>
<item id="description">
<rank>20</rank>
</item>
</items>
</default_search>
<search>
<items>
<item id="name">
@@ -4919,20 +5063,17 @@
<item id="name">
<rank>10</rank>
</item>
<item id="documents_list">
<item id="org_id">
<rank>20</rank>
</item>
<item id="org_id">
<item id="usage_limit">
<rank>30</rank>
</item>
<item id="usage_limit">
<item id="description">
<rank>40</rank>
</item>
<item id="description">
<rank>50</rank>
</item>
<item id="perpetual">
<rank>55</rank>
<rank>50</rank>
</item>
<item id="start_date">
<rank>60</rank>
@@ -4943,8 +5084,24 @@
<item id="licence_key">
<rank>80</rank>
</item>
<item id="documents_list">
<rank>90</rank>
</item>
</items>
</details>
<default_search>
<items>
<item id="name">
<rank>10</rank>
</item>
<item id="description">
<rank>20</rank>
</item>
<item id="licence_key">
<rank>30</rank>
</item>
</items>
</default_search>
<search>
<items>
<item id="name">
@@ -5379,6 +5536,13 @@
</item>
</items>
</details>
<default_search>
<items>
<item id="name">
<rank>10</rank>
</item>
</items>
</default_search>
<search>
<items>
<item id="name">
@@ -6540,6 +6704,19 @@
</item>
</items>
</details>
<default_search>
<items>
<item id="ip">
<rank>10</rank>
</item>
<item id="subnet_name">
<rank>20</rank>
</item>
<item id="org_id">
<rank>30</rank>
</item>
</items>
</default_search>
<search>
<items>
<item id="ip">
@@ -6664,6 +6841,16 @@
</item>
</items>
</details>
<default_search>
<items>
<item id="vlan_tag">
<rank>10</rank>
</item>
<item id="org_id">
<rank>30</rank>
</item>
</items>
</default_search>
<search>
<items>
<item id="vlan_tag">
@@ -6813,6 +7000,13 @@
</item>
</items>
</details>
<default_search>
<items>
<item id="name">
<rank>10</rank>
</item>
</items>
</default_search>
<search>
<items>
<item id="name">
@@ -6913,6 +7107,19 @@
</item>
</items>
</details>
<default_search>
<items>
<item id="friendlyname">
<rank>10</rank>
</item>
<item id="ipaddress">
<rank>20</rank>
</item>
<item id="macaddress">
<rank>30</rank>
</item>
</items>
</default_search>
<search>
<items>
<item id="name">
@@ -7800,6 +8007,19 @@
</item>
</items>
</details>
<default_search>
<items>
<item id="name">
<rank>10</rank>
</item>
<item id="type">
<rank>20</rank>
</item>
<item id="org_id">
<rank>30</rank>
</item>
</items>
</default_search>
<search>
<items>
<item id="name">

2
datamodels/2.x/itop-config-mgmt/en.dict.itop-config-mgmt.php
View File

@@ -1078,7 +1078,7 @@ Dict::Add('EN US', 'English', 'English', array(
'Class:Software+' => '',
'Class:Software/Attribute:name' => 'Name',
'Class:Software/Attribute:name+' => '',
'Class:Software/Attribute:vendor' => 'vendor',
'Class:Software/Attribute:vendor' => 'Vendor',
'Class:Software/Attribute:vendor+' => '',
'Class:Software/Attribute:version' => 'Version',
'Class:Software/Attribute:version+' => '',

46
datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml
View File

@@ -221,6 +221,19 @@
</item>
</items>
</details>
<default_search>
<items>
<item id="name">
<rank>10</rank>
</item>
<item id="org_id">
<rank>20</rank>
</item>
<item id="provider_id">
<rank>30</rank>
</item>
</items>
</default_search>
<search>
<items>
<item id="name">
@@ -983,6 +996,13 @@
</item>
</items>
</details>
<default_search>
<items>
<item id="name">
<rank>10</rank>
</item>
</items>
</default_search>
<search>
<items>
<item id="name">
@@ -1142,6 +1162,19 @@
</item>
</items>
</details>
<default_search>
<items>
<item id="name">
<rank>10</rank>
</item>
<item id="org_id">
<rank>30</rank>
</item>
<item id="servicefamily_id">
<rank>40</rank>
</item>
</items>
</default_search>
<search>
<items>
<item id="name">
@@ -1438,6 +1471,19 @@
</item>
</items>
</details>
<default_search>
<items>
<item id="name">
<rank>10</rank>
</item>
<item id="service_id">
<rank>20</rank>
</item>
<item id="service_org_id">
<rank>30</rank>
</item>
</items>
</default_search>
<search>
<items>
<item id="name">

46
datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml
View File

@@ -225,6 +225,19 @@
</item>
</items>
</details>
<default_search>
<items>
<item id="name">
<rank>10</rank>
</item>
<item id="org_id">
<rank>20</rank>
</item>
<item id="provider_id">
<rank>30</rank>
</item>
</items>
</default_search>
<search>
<items>
<item id="name">
@@ -967,6 +980,13 @@
</item>
</items>
</details>
<default_search>
<items>
<item id="name">
<rank>10</rank>
</item>
</items>
</default_search>
<search>
<items>
<item id="name">
@@ -1148,6 +1168,19 @@
</item>
</items>
</details>
<default_search>
<items>
<item id="name">
<rank>10</rank>
</item>
<item id="org_id">
<rank>30</rank>
</item>
<item id="servicefamily_id">
<rank>40</rank>
</item>
</items>
</default_search>
<search>
<items>
<item id="name">
@@ -1444,6 +1477,19 @@
</item>
</items>
</details>
<default_search>
<items>
<item id="name">
<rank>10</rank>
</item>
<item id="service_id">
<rank>20</rank>
</item>
<item id="service_org_id">
<rank>60</rank>
</item>
</items>
</default_search>
<search>
<items>
<item id="name">

23
datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
View File

@@ -46,6 +46,13 @@
<attribute id="finalclass"/>
</attributes>
</reconciliation>
<indexes>
<index id="ref">
<attributes>
<attribute id="ref"/>
</attributes>
</index>
</indexes>
<obsolescence>
<condition><![CDATA[operational_status='closed' AND (close_date < DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 15 MONTH),'%Y-%m-%d 00:00:00') OR (ISNULL(close_date) AND last_update < DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 15 MONTH),'%Y-%m-%d 00:00:00')))]]></condition>
</obsolescence>
@@ -301,6 +308,22 @@
</item>
</items>
</details>
<default_search>
<items>
<item id="ref">
<rank>10</rank>
</item>
<item id="title">
<rank>20</rank>
</item>
<item id="caller_id">
<rank>30</rank>
</item>
<item id="org_id">
<rank>35</rank>
</item>
</items>
</default_search>
<search>
<items>
<item id="ref">