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

Merge remote-tracking branch 'origin/support/3.1' into develop

Browse Source
This commit is contained in:
Molkobain
2023-10-30 17:00:20 +01:00
parent a1a83a1ba3 ac070b0cbe
commit 0ad8db565d
4 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -744,7 +744,11 @@ HTML
$oPage->SetCurrentTab($sTabCode, $oAttDef->GetLabel().$sCount, $sTabDescription); $oPage->SetCurrentTab($sTabCode, $oAttDef->GetLabel().$sCount, $sTabDescription);
$aArgs = array('this' => $this); $aArgs = array('this' => $this);
$bReadOnly = ($iFlags & (OPT_ATT_READONLY | OPT_ATT_SLAVE));
$sEditWhen = $oAttDef->GetEditWhen();
$bIsEditableBasedOnEditWhen = ($sEditWhen === LINKSET_EDITWHEN_ALWAYS || $sEditWhen === LINKSET_EDITWHEN_ON_HOST_EDITION);
$bReadOnly = ($iFlags & (OPT_ATT_READONLY | OPT_ATT_SLAVE)) || !$bIsEditableBasedOnEditWhen;
if ($bEditMode && (!$bReadOnly)) { if ($bEditMode && (!$bReadOnly)) {
$sInputId = $this->m_iFormId.'_'.$sAttCode; $sInputId = $this->m_iFormId.'_'.$sAttCode;
$sDisplayValue = ''; // not used $sDisplayValue = ''; // not used

1
datamodels/2.x/itop-structure/datamodel.itop-structure.xml
View File

@@ -713,6 +713,7 @@
<linked_class>User</linked_class> <linked_class>User</linked_class>
<ext_key_to_me>contactid</ext_key_to_me> <ext_key_to_me>contactid</ext_key_to_me>
<edit_mode>add_only</edit_mode> <edit_mode>add_only</edit_mode>
<edit_when>on_host_display</edit_when>
<count_min>0</count_min> <count_min>0</count_min>
<count_max>0</count_max> <count_max>0</count_max>
</field> </field>

4
sources/Application/UI/Links/Indirect/BlockIndirectLinkSetEditTable.php
View File

@@ -281,7 +281,7 @@ EOF
if ($bReadOnly) { if ($bReadOnly) {
$aRow['form::checkbox'] = ""; $aRow['form::checkbox'] = "";
foreach ($this->m_aEditableFields as $sFieldCode) { foreach ($this->oUILinksWidget->GetEditableFields() as $sFieldCode) {
$sDisplayValue = $linkObjOrId->GetEditValue($sFieldCode); $sDisplayValue = $linkObjOrId->GetEditValue($sFieldCode);
$aRow[$sFieldCode] = $sDisplayValue; $aRow[$sFieldCode] = $sDisplayValue;
} }
@@ -435,7 +435,7 @@ JS
$oAttDef = MetaModel::GetAttributeDef($this->oUILinksWidget->GetLinkedClass(), $sFieldCode); $oAttDef = MetaModel::GetAttributeDef($this->oUILinksWidget->GetLinkedClass(), $sFieldCode);
if ($bReadOnlyField) { if ($bReadOnlyField) {
$sFieldForHtml = $sDisplayValue; $sFieldForHtml = $oAttDef->GetAsHTML($sValue);
} else { } else {
$sFieldForHtml = cmdbAbstractObject::GetFormElementForField( $sFieldForHtml = cmdbAbstractObject::GetFormElementForField(
$oP, $oP,

2
sources/Composer/iTopComposer.php
View File

@@ -140,6 +140,8 @@ class iTopComposer
$APPROOT_WITH_SLASHES.'lib/symfony/web-profiler-bundle/Tests', $APPROOT_WITH_SLASHES.'lib/symfony/web-profiler-bundle/Tests',
$APPROOT_WITH_SLASHES.'lib/symfony/yaml/Tests', $APPROOT_WITH_SLASHES.'lib/symfony/yaml/Tests',
$APPROOT_WITH_SLASHES.'lib/thenetworg/oauth2-azure/tests',
$APPROOT_WITH_SLASHES.'lib/twig/twig/src/Test', $APPROOT_WITH_SLASHES.'lib/twig/twig/src/Test',
$APPROOT_WITH_SLASHES.'lib/twig/twig/lib/Twig/Test', $APPROOT_WITH_SLASHES.'lib/twig/twig/lib/Twig/Test',
$APPROOT_WITH_SLASHES.'lib/twig/twig/doc/tests', $APPROOT_WITH_SLASHES.'lib/twig/twig/doc/tests',