From b54918bb5e95a4451f65d1435449995e15869328 Mon Sep 17 00:00:00 2001 From: Molkobain Date: Fri, 5 Mar 2021 11:57:40 +0100 Subject: [PATCH] =?UTF-8?q?N=C2=B03649=20-=20Fix=20object=20form=20display?= =?UTF-8?q?=20in=20modals?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/ui.extkeywidget.class.inc.php | 35 +++++++---------------- 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/application/ui.extkeywidget.class.inc.php b/application/ui.extkeywidget.class.inc.php index 01ee8256af..cb2a48aaac 100644 --- a/application/ui.extkeywidget.class.inc.php +++ b/application/ui.extkeywidget.class.inc.php @@ -908,8 +908,7 @@ JS $sClassAlias = $oSet->GetFilter()->GetClassAlias(); if (isset($aConsts[$sClassAlias])) { - foreach($aConsts[$sClassAlias] as $sAttCode => $value) - { + foreach($aConsts[$sClassAlias] as $sAttCode => $value) { $oNewObj->Set($sAttCode, $value); } } @@ -918,42 +917,30 @@ JS // 3rd - set values from the page argument 'default' $oNewObj->UpdateObjectFromArg('default'); - $sDialogTitle = ''; $sClassLabel = MetaModel::GetName($this->sTargetClass); - $sClassIcon = MetaModel::GetClassIcon($this->sTargetClass); - $sObjClass = get_class($oNewObj); - $sObjKey = $oNewObj->GetKey(); - $sHeaderTitle = Dict::Format('UI:CreationTitle_Class', $sClassLabel); + $sHeaderTitleEscaped = utils::EscapeHtml(Dict::Format('UI:CreationTitle_Class', $sClassLabel)); + $oPage->add(<< - -
- -
-
-

$sClassIcon $sHeaderTitle

+
+
HTML ); $aFieldsFlags = array(); $aFieldsComments = array(); - foreach(MetaModel::ListAttributeDefs($this->sTargetClass) as $sAttCode => $oAttDef) - { - if (($oAttDef instanceof AttributeBlob) || (false)) - { + foreach (MetaModel::ListAttributeDefs($this->sTargetClass) as $sAttCode => $oAttDef) { + if (($oAttDef instanceof AttributeBlob) || (false)) { $aFieldsFlags[$sAttCode] = OPT_ATT_READONLY; $aFieldsComments[$sAttCode] = ' '; } } - cmdbAbstractObject::DisplayCreationForm($oPage, $this->sTargetClass, $oNewObj, array(), array('formPrefix' => $this->iId, 'noRelations' => true, 'fieldsFlags' => $aFieldsFlags, 'fieldsComments' => $aFieldsComments)); + cmdbAbstractObject::DisplayCreationForm($oPage, $this->sTargetClass, $oNewObj, array(), array('formPrefix' => $this->iId, 'noRelations' => true, 'fieldsFlags' => $aFieldsFlags, 'fieldsComments' => $aFieldsComments)); $oPage->add(<< -
-
+
HTML ); -// $oPage->add_ready_script("\$('#ac_create_$this->iId').dialog({ width: $(window).width()*0.8, height: 'auto', autoOpen: false, modal: true, title: '$sDialogTitle'});\n"); - $oPage->add_ready_script("\$('#ac_create_$this->iId').dialog({ width: 'auto', height: 'auto', maxHeight: $(window).height() - 50, autoOpen: false, modal: true, title: '$sDialogTitle'});\n"); + + $oPage->add_ready_script("\$('#ac_create_$this->iId').dialog({ width: 'auto', height: 'auto', maxHeight: $(window).height() - 50, autoOpen: false, modal: true});\n"); $oPage->add_ready_script("$('#dcr_{$this->iId} form').removeAttr('onsubmit');"); $oPage->add_ready_script("$('#dcr_{$this->iId} form').bind('submit.uilinksWizard', oACWidget_{$this->iId}.DoCreateObject);"); }