composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-20 00:58:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°3792 - Deprecate "buttons_position" config. param.

Browse Source
This commit is contained in:
Molkobain
2021-03-04 19:27:25 +01:00
parent 29bf4561e5
commit 71db321570
2 changed files with 4 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
application/cmdbabstract.class.inc.php
View File

@@ -2629,10 +2629,6 @@ HTML;
}
}
// TODO 3.0.0: Remove config param and related code below when rework is done and UX approved
//$sButtonsPosition = MetaModel::GetConfig()->Get('buttons_position');
$sButtonsPosition = 'top';
$sStatesSelection = '';
if (!isset($aExtraParams['custom_operation']) && $this->IsNew())
{
@@ -2688,11 +2684,8 @@ EOF
$oPage->SetCurrentTabContainer(OBJECT_PROPERTIES_TAB);
$oPage->SetCurrentTab('UI:PropertiesTab');
if ($sButtonsPosition != 'bottom') {
// top or both, display the buttons here
$oPage->p($sStatesSelection);
$oObjectDetails->AddToolbarBlock($oToolbarTop);
}
$oPage->p($sStatesSelection);
$oObjectDetails->AddToolbarBlock($oToolbarTop);
$aFieldsMap = $this->DisplayBareProperties($oPage, true, $sPrefix, $aExtraParams);
if (!is_array($aFieldsMap)) {
@@ -2719,15 +2712,6 @@ EOF
$oForm->AddSubBlock(InputUIBlockFactory::MakeForHidden('ownership_token', utils::HtmlEntities($sOwnershipToken)));
}
$oPage->add($oAppContext->GetForForm());
if ($sButtonsPosition != 'top') {
// bottom or both: display the buttons here
$oPage->p($sStatesSelection);
$oToolbarBottom = ToolbarUIBlockFactory::MakeStandard();
foreach ($oToolbarTop->GetSubBlocks() as $oButton) {
$oToolbarBottom->AddSubBlock($oButton);
}
$oForm->AddSubBlock($oToolbarBottom);
}
// Hook the cancel button via jQuery so that it can be unhooked easily as well if needed
$sDefaultUrl = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=cancel&'.$oAppContext->GetForLink();
@@ -3052,13 +3036,6 @@ HTML
$oPage->AddUiBlock(TitleUIBlockFactory::MakeForPage($sActionDetails));
}
$sButtonsPosition = MetaModel::GetConfig()->Get('buttons_position');
// Display object detail above if buttons must be displayed on the bottom
if ($sButtonsPosition == 'bottom' && $bDisplayBareProperties) {
// bottom: Displays the ticket details BEFORE the actions
$this->DisplayDetails($oPage, false, $sMode);
}
$oFormContainer = new UIContentBlock(null, ['ibo-wizard-container']);
$oPage->AddUiBlock($oFormContainer);
$oForm = new Combodo\iTop\Application\UI\Base\Component\Form\Form('apply_stimulus');
@@ -3096,13 +3073,6 @@ HTML
HTML
);
// Display object detail below if buttons must be displayed on the top
if ($sButtonsPosition != 'top' && $bDisplayBareProperties)
{
// bottom or both: Displays the ticket details AFTER the actions
$this->DisplayDetails($oPage, false, $sMode);
}
$iFieldsCount = count($aFieldsMap);
$sJsonFieldsMap = json_encode($aFieldsMap);

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

@@ -763,12 +763,12 @@ class Config
],
'buttons_position' => [
'type' => 'string',
'description' => 'Position of the forms buttons: bottom | top | both',
'description' => 'Deprecated since 3.0.0, buttons are now always on top of the form.',
// examples... not used
'default' => 'both',
'value' => 'both',
'source_of_value' => '',
'show_in_conf_sample' => true,
'show_in_conf_sample' => false,
],
'shortcut_actions' => [
'type' => 'string',