diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php index 3f5388ed9..1404ef3b5 100644 --- a/application/cmdbabstract.class.inc.php +++ b/application/cmdbabstract.class.inc.php @@ -520,7 +520,7 @@ EOF $aParams = array( 'target_attr' => $oAttDef->GetExtKeyToMe(), 'object_id' => $this->GetKey(), - 'menu' => false, + 'menu' => MetaModel::GetConfig()->Get('allow_menu_on_linkset'), 'default' => $aDefaults, 'table_id' => $sClass.'_'.$sAttCode, ); @@ -535,7 +535,7 @@ EOF 'object_id' => $this->GetKey(), 'target_attr' => $oAttDef->GetExtKeyToRemote(), 'view_link' => false, - 'menu' => false, + 'menu' => MetaModel::GetConfig()->Get('allow_menu_on_linkset'), 'display_limit' => true, // By default limit the list to speed up the initial load & display 'table_id' => $sClass.'_'.$sAttCode, ); diff --git a/core/config.class.inc.php b/core/config.class.inc.php index 8ef321f64..2a14d5791 100644 --- a/core/config.class.inc.php +++ b/core/config.class.inc.php @@ -194,14 +194,22 @@ class Config 'source_of_value' => '', 'show_in_conf_sample' => false, ), - 'allow_target_creation' => array( - 'type' => 'bool', - 'description' => 'Displays the + button on external keys to create target objects', - 'default' => true, - 'value' => true, - 'source_of_value' => '', - 'show_in_conf_sample' => false, - ), + 'allow_menu_on_linkset' => array( + 'type' => 'bool', + 'description' => 'Display Action menus in view mode on any LinkedSet with edit_mode != none', + 'default' => false, + 'value' => false, + 'source_of_value' => '', + 'show_in_conf_sample' => false, + ), + 'allow_target_creation' => array( + 'type' => 'bool', + 'description' => 'Displays the + button on external keys to create target objects', + 'default' => true, + 'value' => true, + 'source_of_value' => '', + 'show_in_conf_sample' => false, + ), // Levels that trigger a confirmation in the CSV import/synchro wizard 'csv_import_min_object_confirmation' => array( 'type' => 'integer',