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

🐛 N°6043 - fix linkset attribute default handler impact

Browse Source
This commit is contained in:
Benjamin Dalsass
2023-03-21 07:55:22 +01:00
parent d8d8756623
commit 4a9c3d3582
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/attributedef.class.inc.php
View File

@@ -1660,7 +1660,12 @@ class AttributeLinkedSet extends AttributeDefinition
*/
public function GetDisplayStyle()
{
return $this->GetOptional('display_style', LINKSET_DISPLAY_STYLE_TAB);
$sDisplayStyle = $this->GetOptional('display_style', LINKSET_DISPLAY_STYLE_TAB);
if ($sDisplayStyle === '') {
$sDisplayStyle = LINKSET_DISPLAY_STYLE_TAB;
}
return $sDisplayStyle;
}
/**

6
sources/Application/UI/Links/Direct/BlockDirectLinksEditTable.php
View File

@@ -16,7 +16,6 @@ use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Component\Toolbar\Toolbar;
use Combodo\iTop\Application\UI\Base\Component\Toolbar\ToolbarUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Layout\UIContentBlock;
use Combodo\iTop\Service\Links\LinkSetModel;
use ConfigException;
use CoreException;
use CoreUnexpectedValue;
@@ -24,6 +23,7 @@ use DBObjectSet;
use Dict;
use DictExceptionMissingString;
use Exception;
use iDBObjectSetIterator;
use MetaModel;
use MySQLException;
use UILinksWidgetDirect;
@@ -134,7 +134,7 @@ class BlockDirectLinksEditTable extends UIContentBlock
*
* @return void
*/
public function InitTable(WebPage $oPage, DBObjectSet $oValue, string $sFormPrefix)
public function InitTable(WebPage $oPage, iDBObjectSetIterator $oValue, string $sFormPrefix)
{
$this->sInputName = $sFormPrefix.'attr_'.$this->oUILinksDirectWidget->GetAttCode();
$this->sWizHelper = 'oWizardHelper'.$sFormPrefix;
@@ -239,7 +239,7 @@ class BlockDirectLinksEditTable extends UIContentBlock
* @throws MySQLException
* @throws Exception
*/
private function GetTableRows(\WebPage $oPage, \DBObjectSet $oValue): array
private function GetTableRows(\WebPage $oPage, iDBObjectSetIterator $oValue): array
{
// result data
$aRows = array();