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

Portal: Fixed regression on always_show_submit form option

Browse Source 
SVN:trunk[4730]
This commit is contained in:
Guillaume Lajarige
2017-05-10 15:48:57 +00:00
parent 02c79fd0a2
commit 623fa8ec63
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
datamodels/2.x/itop-portal-base/portal/src/controllers/objectcontroller.class.inc.php
View File

@@ -515,7 +515,7 @@ class ObjectController extends AbstractController
}
// Hiding submit button or changing its label if necessary
if($aFormProperties['properties']['always_show_submit'] === false)
if($aFormProperties['properties']['always_show_submit'] === false && !empty($aFormData['buttons']['transitions']))
{
unset($aFormData['buttons']['submit']);
}

1
datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php
View File

@@ -863,6 +863,7 @@ class ApplicationHelper
{
case 'always_show_submit':
$aFormProperties['always_show_submit'] = ($oPropertyNode->GetText('false') === 'true') ? true : false;
break;
}
}
}