mirror of
https://github.com/Combodo/iTop.git
synced 2026-05-20 07:42:17 +02:00
N°8399 - Portal: unnecessary screen is displayed during a transition with no field to display
This commit is contained in:
committed by
Benjamin Dalsass
parent
975c554e91
commit
2e77713772
@@ -359,7 +359,8 @@ class ObjectFormManager extends FormManager
|
|||||||
foreach ($this->aFieldsAtts as $sAttCode => $iFieldFlags)
|
foreach ($this->aFieldsAtts as $sAttCode => $iFieldFlags)
|
||||||
{
|
{
|
||||||
// handle plugins fields
|
// handle plugins fields
|
||||||
if(array_key_exists($sAttCode, $this->aExtraData)
|
if($this->sMode !== 'apply_stimulus'
|
||||||
|
&& array_key_exists($sAttCode, $this->aExtraData)
|
||||||
&& array_key_exists('plugin', $this->aExtraData[$sAttCode])){
|
&& array_key_exists('plugin', $this->aExtraData[$sAttCode])){
|
||||||
$sPluginName = $this->aExtraData[$sAttCode]['plugin'];
|
$sPluginName = $this->aExtraData[$sAttCode]['plugin'];
|
||||||
switch($sPluginName){
|
switch($sPluginName){
|
||||||
@@ -713,7 +714,8 @@ class ObjectFormManager extends FormManager
|
|||||||
|
|
||||||
// fallback Checking if the instance has attachments
|
// fallback Checking if the instance has attachments
|
||||||
// (in case attachment is not explicitly declared in layout)
|
// (in case attachment is not explicitly declared in layout)
|
||||||
if (class_exists('Attachment') && class_exists('AttachmentPlugIn')
|
if ($this->sMode !== 'apply_stimulus'
|
||||||
|
&& class_exists('Attachment') && class_exists('AttachmentPlugIn')
|
||||||
&& !$this->IsPluginInitialized(AttachmentPlugIn::class)
|
&& !$this->IsPluginInitialized(AttachmentPlugIn::class)
|
||||||
&& AttachmentPlugIn::IsAttachmentAllowedForObject($this->oObject)){
|
&& AttachmentPlugIn::IsAttachmentAllowedForObject($this->oObject)){
|
||||||
$this->AddAttachmentField($this->oForm, 'attachments_plugin', $this->aExtraData);
|
$this->AddAttachmentField($this->oForm, 'attachments_plugin', $this->aExtraData);
|
||||||
|
|||||||
Reference in New Issue
Block a user