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

Merge remote-tracking branch 'refs/remotes/origin/support/3.2' into develop

Browse Source 
# Conflicts:
#	pages/ajax.render.php
This commit is contained in:
jf-cbd
2024-04-30 08:18:57 +02:00
parent bc7db973ad 24cf28f09a
commit e51e55b634
5 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
datamodels/2.x/combodo-backoffice-darkmoon-theme/scss/scss-variables.scss
View File

@@ -276,4 +276,9 @@ $ibo-datamodel-viewer--schema--tooltip--fill: $ibo-color-grey-600;
$ibo-csv-import--row-error--background-color: $ibo-color-red-950;
$ibo-csv-import--cell-error--color: $ibo-color-red-500;
$ibo-csv-import--cell-modified--color: $ibo-color-blue-500;
$ibo-csv-import--cell-modified--color: $ibo-color-blue-500;
$ibo-welcome-popup--messages-stack--background-color: $ibo-color-grey-700;
$ibo-welcome-popup--stack-item--background-color: $ibo-color-grey-600;
$ibo-welcome-popup--stack-item--border-color: $ibo-color-grey-800;
$ibo-welcome-popup--stack-item--is-active--border-color: $ibo-color-grey-900;

5
datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/scss/scss-variables.scss
View File

File diff suppressed because one or more lines are too long

4
datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/scss/stylesheet.scss
View File

@@ -142,4 +142,8 @@ $ibo-toast--icon--left: $ibo-spacing-400 !default;
.ibo-popover-menu--item:not(:last-child){
border-bottom: $ibo-high-contrast--thin-border;
}
.ibo-welcome-popup--stack-item.ibo-is-active {
border-width: 2px;
}

2
pages/ajax.render.php
View File

@@ -1120,7 +1120,7 @@ EOF
if ($oDashlet->IsFormRedrawNeeded()) {
$oForm = $oDashlet->GetForm(); // Rebuild the form since the values/content changed
$oForm->SetSubmitParams(utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php', array('operation' => 'update_dashlet_property', 'extra_params' => $aExtraParams));
$sHtml = addslashes($oForm->RenderAsPropertySheet($oPage, true, '.itop-dashboard'));
$sHtml = $oForm->RenderAsPropertySheet($oPage, true, '.itop-dashboard');
$sHtml= json_encode($sHtml);
$oPage->add_script("$('#dashlet_$sDashletId').html({$sHtml});");
}

1
tests/php-unit-tests/unitary-tests/application/applicationextension/Delta/application-extension-usages-in-snippets.xml
View File

@@ -291,7 +291,6 @@ class ExampleFor_iQueryModifier implements \iQueryModifier
public function GetFieldExpression(QueryBuilderContext &$oBuild, $sClass, $sAttCode, $sColId, Expression $oFieldSQLExp, SQLQuery &$oSelect)
{
// Do nothing, we just need the class to exists for the unit test
return $oFieldSQLExp;
}
}