From a903711a7aa442d72c4c8792c2a5b1b0967976c4 Mon Sep 17 00:00:00 2001 From: Vincent Dumas Date: Mon, 25 Jun 2018 13:23:35 +0000 Subject: [PATCH] Add default search criterion on Action and Profile classes SVN:trunk[5908] --- addons/userrights/userrightsprofile.db.class.inc.php | 7 ++----- addons/userrights/userrightsprojection.class.inc.php | 7 ++----- core/action.class.inc.php | 2 +- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/addons/userrights/userrightsprofile.db.class.inc.php b/addons/userrights/userrightsprofile.db.class.inc.php index 59db554f0..a1293a272 100644 --- a/addons/userrights/userrightsprofile.db.class.inc.php +++ b/addons/userrights/userrightsprofile.db.class.inc.php @@ -97,11 +97,8 @@ class URP_Profiles extends UserRightsBaseClassGUI MetaModel::Init_SetZListItems('details', array('name', 'description', 'user_list')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('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 ( - 0 => 'name', - )); + MetaModel::Init_SetZListItems('standard_search', array('name', 'description')); // Criteria of the std search form + MetaModel::Init_SetZListItems('default_search', array ('name', 'description')); } protected $m_bCheckReservedNames = true; diff --git a/addons/userrights/userrightsprojection.class.inc.php b/addons/userrights/userrightsprojection.class.inc.php index 909cbc839..4ff9aeff3 100644 --- a/addons/userrights/userrightsprojection.class.inc.php +++ b/addons/userrights/userrightsprojection.class.inc.php @@ -78,11 +78,8 @@ class URP_Profiles extends UserRightsBaseClass MetaModel::Init_SetZListItems('details', array('name', 'description', 'user_list')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('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 ( - 0 => 'name', - )); + MetaModel::Init_SetZListItems('standard_search', array('name', 'description')); // Criteria of the std search form + MetaModel::Init_SetZListItems('default_search', array ('name', 'description')); } function GetGrantAsHtml($oUserRights, $sClass, $sAction) diff --git a/core/action.class.inc.php b/core/action.class.inc.php index f6a587cfd..fc5a3e3f6 100644 --- a/core/action.class.inc.php +++ b/core/action.class.inc.php @@ -60,7 +60,7 @@ abstract class Action extends cmdbAbstractObject MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'trigger_list')); // Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('list', array('finalclass', 'name', 'description', 'status')); // 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('default_search', array('name', 'description', 'status')); // Criteria of the std search form // MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form }