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

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

Browse Source
This commit is contained in:
Molkobain
2022-07-29 15:28:11 +02:00
parent 8c7fa53696 a2973f6f28
commit 435dce91d7
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/wizardhelper.js
View File

@@ -261,7 +261,7 @@ function WizardHelper(sClass, sFormPrefix, sState, sInitialState, sStimulus) {
index++;
}
if($('.blockUI').length > 0) {
if ((fieldForm !== null) && ($('.blockUI').length > 0)) {
fieldForm.find('button[type=submit]:not(:disabled)').prop("disabled", true).addClass('disabledDuringFieldLoading');
}

9
test/itop-config/Validator/iTopConfigSyntaxValidatorTest.php
View File

@@ -42,9 +42,12 @@ class iTopConfigSyntaxValidatorTest extends ItopTestCase
$this->expectException(\Exception::class);
try{
$oiTopConfigValidator->Validate("<?php \n zef;zefzef \n zdadz = azdazd \n zerfgzaezerfgzef>");
}catch (\Exception $e)
{
$this->assertStringStartsWith('Error in configuration: syntax error, unexpected \'zdadz\' (T_STRING)', $e->getMessage());
} catch (\Exception $e) {
if (version_compare(phpversion(), '8.0.0', '<')) {
$this->assertStringStartsWith('Error in configuration: syntax error, unexpected \'zdadz\' (T_STRING)', $e->getMessage());
} else {
$this->assertStringStartsWith('Error in configuration: syntax error, unexpected identifier "zdadz" at line 2', $e->getMessage());
}
throw $e;
}
}