diff --git a/application/ajaxwebpage.class.inc.php b/application/ajaxwebpage.class.inc.php index 50553cf5b..d0782f3cf 100644 --- a/application/ajaxwebpage.class.inc.php +++ b/application/ajaxwebpage.class.inc.php @@ -1,5 +1,5 @@ diff --git a/core/trigger.class.inc.php b/core/trigger.class.inc.php index 512de48ce..b8e7693ec 100644 --- a/core/trigger.class.inc.php +++ b/core/trigger.class.inc.php @@ -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() diff --git a/core/userrights.class.inc.php b/core/userrights.class.inc.php index 7dc5495eb..26d833c62 100644 --- a/core/userrights.class.inc.php +++ b/core/userrights.class.inc.php @@ -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); diff --git a/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml b/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml index 90c6b5d31..a49c36263 100755 --- a/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml +++ b/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml @@ -82,6 +82,13 @@ + + + + 10 + + + @@ -234,6 +241,19 @@ + + + + 10 + + + 20 + + + 30 + + + @@ -423,7 +443,7 @@ 10 - + 20 @@ -1018,6 +1038,19 @@ + + + + 10 + + + 20 + + + 30 + + + @@ -1538,6 +1571,16 @@ + + + + 10 + + + 30 + + + @@ -1809,6 +1852,19 @@ + + + + 10 + + + 20 + + + 30 + + + @@ -2253,6 +2309,19 @@ + + + + 10 + + + 20 + + + 30 + + + @@ -3345,6 +3414,19 @@ + + + + 10 + + + 20 + + + 30 + + + @@ -4134,6 +4216,19 @@ + + + + 10 + + + 20 + + + 30 + + + @@ -4254,6 +4349,19 @@ + + + + 10 + + + 20 + + + 30 + + + @@ -4383,6 +4491,19 @@ + + + + 10 + + + 20 + + + 30 + + + @@ -4540,6 +4661,19 @@ + + + + 10 + + + 20 + + + 30 + + + @@ -4629,6 +4763,16 @@ + + + + 10 + + + 20 + + + @@ -4919,20 +5063,17 @@ 10 - + 20 - + 30 - + 40 - - 50 - - 55 + 50 60 @@ -4943,8 +5084,24 @@ 80 + + 90 + + + + + 10 + + + 20 + + + 30 + + + @@ -5379,6 +5536,13 @@ + + + + 10 + + + @@ -6540,6 +6704,19 @@ + + + + 10 + + + 20 + + + 30 + + + @@ -6664,6 +6841,16 @@ + + + + 10 + + + 30 + + + @@ -6813,6 +7000,13 @@ + + + + 10 + + + @@ -6913,6 +7107,19 @@ + + + + 10 + + + 20 + + + 30 + + + @@ -7800,6 +8007,19 @@ + + + + 10 + + + 20 + + + 30 + + + diff --git a/datamodels/2.x/itop-config-mgmt/en.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/en.dict.itop-config-mgmt.php index 7c7e85e24..e7ce020da 100755 --- a/datamodels/2.x/itop-config-mgmt/en.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/en.dict.itop-config-mgmt.php @@ -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+' => '', diff --git a/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml b/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml index 0f30b72cb..97349e87c 100755 --- a/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml +++ b/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml @@ -221,6 +221,19 @@ + + + + 10 + + + 20 + + + 30 + + + @@ -983,6 +996,13 @@ + + + + 10 + + + @@ -1142,6 +1162,19 @@ + + + + 10 + + + 30 + + + 40 + + + @@ -1438,6 +1471,19 @@ + + + + 10 + + + 20 + + + 30 + + + diff --git a/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml b/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml index 0eae5748f..a7706d29e 100755 --- a/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml +++ b/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml @@ -225,6 +225,19 @@ + + + + 10 + + + 20 + + + 30 + + + @@ -967,6 +980,13 @@ + + + + 10 + + + @@ -1148,6 +1168,19 @@ + + + + 10 + + + 30 + + + 40 + + + @@ -1444,6 +1477,19 @@ + + + + 10 + + + 20 + + + 60 + + + diff --git a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml index 7c41b0e9f..45c37c599 100755 --- a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml +++ b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml @@ -46,6 +46,13 @@ + + + + + + + @@ -301,6 +308,22 @@ + + + + 10 + + + 20 + + + 30 + + + 35 + + +