');
- if ((count($this->aWizardSteps) > 0) && ($oStep->CanMoveBackward())) {
- $oPage->add(' | ');
+ if (count($this->aWizardSteps) > 0) {
+ if ($oStep->CanMoveBackward()) {
+ $oPage->add(' | ');
+ } else {
+ $oPage->add(' | ');
+ }
}
if ($oStep->CanMoveForward()) {
$oPage->add(' | ');
diff --git a/setup/wizardsteps/WizStepDataAudit.php b/setup/wizardsteps/WizStepDataAudit.php
index 725ce2f1a..fe8e2bfe5 100644
--- a/setup/wizardsteps/WizStepDataAudit.php
+++ b/setup/wizardsteps/WizStepDataAudit.php
@@ -54,16 +54,20 @@ class WizStepDataAudit extends WizStepInstall
}
}
+ /**
+ * Tells whether this step/state allows to go back or not
+ * @return boolean True if the '<< Back' button should be displayed
+ */
+ public function CanMoveBackward()
+ {
+ return false;
+ }
+
public function UpdateWizardStateAndGetNextStep($bMoveForward = true): WizardState
{
return new WizardState(WizStepSummary::class);
}
- public function CanComeBack()
- {
- return false;
- }
-
public function Display(SetupPage $oPage): void
{
@@ -108,6 +112,7 @@ JS);
'removed_extensions' => '[]',
'extensions_not_uninstallable' => '[]',
'copy_setup_files' => 1,
+ 'return_button_label' => '',
];
$aHiddenInputs = '';
foreach ($aParams as $sParamName => $defaultValue) {
@@ -123,23 +128,43 @@ INPUT;
<<
-
+
$aHiddenInputs
HTML
);
+
+ $sButtonLabel = $this->oWizard->GetParameter('return_button_label', '');
+ if ($sButtonLabel !== '') {
+ $sButtonLabel = utils::HtmlEntities($sButtonLabel);
+ $sButtonUrl = utils::GetAbsoluteUrlModulePage('itsm-designer-connector', 'launch.php');
+ $sButtonUrl = utils::HtmlEntities($sButtonUrl);
+ $oPage->add_ready_script(
+ <<');
+JS
+ );
+ }
}
protected function AddProgressErrorScript($oPage, $aRes)
{
+ $oPage->add_ready_script(
+ << 0) {
+ $('#return-button').removeClass('ibo-is-hidden');
+ }
+JS
+ );
+
if (isset($aRes['error_code']) && $aRes['error_code'] === DataAuditSequencer::DATA_AUDIT_FAILED) {
$oPage->add_ready_script(
- <<');
+ <<');
$('#ignore_and_continue').on('click', function() {
return confirm("If you skip the cleanup you won't be able to run the process later. You'll have to migrate or delete unconsistent data manually.");
});
- $('.ibo-setup--wizard--buttons-container tr td:nth-child(2)').after(' | ');
+ $('.ibo-setup--wizard--buttons-container tr td:nth-child(3)').after(' | ');
$('#goto-data-feature-removal').on("click", function() {
$('#goto-data-feature-removal').prop('disabled', true);
$('#submit-wait').removeClass("ibo-is-hidden");
@@ -148,7 +173,7 @@ HTML
$("#wiz_form").data("installation_status", "cleanup_needed");
$('#btn_next').hide();
-EOF
+JS
);
}
@@ -161,6 +186,10 @@ EOF
public function JSCanMoveBackward()
{
+ if ($this->oWizard->GetParameter('return_button_label', '') !== '') {
+ return 'return false;';
+ }
+
return 'return ["not started", "error", "cleanup_needed"].indexOf($("#wiz_form").data("installation_status")) !== -1;';
}
}
diff --git a/setup/wizardsteps/WizStepDone.php b/setup/wizardsteps/WizStepDone.php
index 2cde077c2..843ead687 100644
--- a/setup/wizardsteps/WizStepDone.php
+++ b/setup/wizardsteps/WizStepDone.php
@@ -144,6 +144,11 @@ class WizStepDone extends WizardStep
return false;
}
+ public function JSCanMoveBackward()
+ {
+ return 'return false;';
+ }
+
/**
* Tells whether this step of the wizard requires that the configuration file be writable
* @return bool True if the wizard will possibly need to modify the configuration at some point
diff --git a/setup/wizardsteps/WizStepInstall.php b/setup/wizardsteps/WizStepInstall.php
index 9b3499acc..648e1f2e7 100644
--- a/setup/wizardsteps/WizStepInstall.php
+++ b/setup/wizardsteps/WizStepInstall.php
@@ -54,6 +54,13 @@ class WizStepInstall extends AbstractWizStepInstall
}
}
+ public function CanMoveBackward()
+ {
+ $sLabel = $this->oWizard->GetParameter('return_button_label', '');
+ SetupLog::Info(__METHOD__.": return_button_label [$sLabel]");
+ return $sLabel === '';
+ }
+
public function UpdateWizardStateAndGetNextStep($bMoveForward = true): WizardState
{
return new WizardState(WizStepDone::class);
@@ -109,6 +116,20 @@ JS);
JS);
}
+ public function PostFormDisplay(SetupPage $oPage)
+ {
+ $sButtonLabel = $this->oWizard->GetParameter('return_button_label', '');
+ SetupLog::Info(__METHOD__.": return_button_label [$sButtonLabel]");
+ if ($sButtonLabel !== '') {
+ $sButtonUrl = utils::GetAbsoluteUrlModulePage('itsm-designer-connector', 'launch.php');
+ $oPage->add_ready_script(
+ <<');
+JS
+ );
+ }
+ }
+
/**
* @throws \Exception
*/
@@ -125,27 +146,25 @@ JS);
// Tell the web page to move the progress bar and to launch the next step
$sMessage = addslashes(utils::EscapeHtml($aRes['next-step-label']));
$oPage->add_ready_script(
- <<{$aRes['next-step-label']}');
- ExecuteStep('{$aRes['next-step']}');
-EOF
+ <<{$aRes['next-step-label']}');
+ ExecuteStep('{$aRes['next-step']}');
+JS
);
static::AddPrevStepSuccessMessage($oPage, $aRes['prev-step-success-message']);
} elseif ($aRes['status'] !== StepSequencer::ERROR) {
// Installation complete, move to the next step of the wizard
$oPage->add_ready_script(
- <<', $sMessage);
$oPage->add_ready_script(
- <<AddProgressErrorScript($oPage, $aRes);
}
@@ -166,7 +185,13 @@ EOF
protected function AddProgressErrorScript($oPage, $aRes)
{
-
+ $oPage->add_ready_script(
+ << 0) {
+ $('#return-button').removeClass('ibo-is-hidden');
+ }
+JS
+ );
}
/**
diff --git a/setup/wizardsteps/WizStepLandingBeforeAudit.php b/setup/wizardsteps/WizStepLandingBeforeAudit.php
index e29674720..d4bb4aa10 100644
--- a/setup/wizardsteps/WizStepLandingBeforeAudit.php
+++ b/setup/wizardsteps/WizStepLandingBeforeAudit.php
@@ -84,7 +84,7 @@ class WizStepLandingBeforeAudit extends WizStepModulesChoice
return 'Next';
}
- public function CanComeBack()
+ public function CanMoveBackward()
{
return false;
}
diff --git a/setup/wizardsteps/WizStepSummary.php b/setup/wizardsteps/WizStepSummary.php
index f8cefaa9d..1f91b4536 100644
--- a/setup/wizardsteps/WizStepSummary.php
+++ b/setup/wizardsteps/WizStepSummary.php
@@ -57,6 +57,14 @@ class WizStepSummary extends AbstractWizStepInstall
}
}
+ public function CanMoveBackward()
+ {
+ $sLabel = $this->oWizard->GetParameter('return_button_label', '');
+ SetupLog::Info(__METHOD__.": return_button_label [$sLabel]");
+
+ return $sLabel === '';
+ }
+
public function UpdateWizardStateAndGetNextStep($bMoveForward = true): WizardState
{
$this->oWizard->SaveParameter('db_backup', false);
@@ -242,6 +250,19 @@ JS
);
}
+ public function PostFormDisplay(SetupPage $oPage)
+ {
+ $sButtonLabel = $this->oWizard->GetParameter('return_button_label', '');
+ if ($sButtonLabel !== '') {
+ $sButtonUrl = utils::GetAbsoluteUrlModulePage('itsm-designer-connector', 'launch.php');
+ $oPage->add_ready_script(
+ <<');
+JS
+ );
+ }
+ }
+
/**
* Tells whether the "Next" button should be enabled interactively
* @return string A piece of javascript code returning either true or false
@@ -257,7 +278,11 @@ JS
*/
public function JSCanMoveBackward()
{
- return 'return true;';
+ if ($this->oWizard->GetParameter('return_button_label', '') === '') {
+ return 'return true;';
+ }
+
+ return 'return false;';
}
}
diff --git a/setup/wizardsteps/WizStepWelcome.php b/setup/wizardsteps/WizStepWelcome.php
index c89389a16..1ad187382 100644
--- a/setup/wizardsteps/WizStepWelcome.php
+++ b/setup/wizardsteps/WizStepWelcome.php
@@ -18,8 +18,6 @@
* You should have received a copy of the GNU Affero General Public License
*/
-use Combodo\iTop\Application\WebPage\WebPage;
-
/**
* First step of the iTop Installation Wizard: Welcome screen, requirements
*/
@@ -98,7 +96,7 @@ EOF
$sStyle = 'style="display:none;overflow:auto;"';
$sToggleButtons = '';
if (count($aErrors) > 0) {
- $sStyle = 'overflow:auto;"';
+ $sStyle = 'style="overflow:auto;"';
$sTitle = count($aErrors).' Error(s), '.count($aWarnings).' Warning(s).';
$sH2Class = 'text-error';
} elseif (count($aWarnings) > 0) {
diff --git a/setup/wizardsteps/WizardStep.php b/setup/wizardsteps/WizardStep.php
index bad393a3e..a953c5275 100644
--- a/setup/wizardsteps/WizardStep.php
+++ b/setup/wizardsteps/WizardStep.php
@@ -151,15 +151,6 @@ abstract class WizardStep
return true;
}
- /**
- * Tells whether the user will come back to this step/state if he click on "Back"
- * @return boolean True if the 'Back' button should display this step
- */
- public function CanComeBack()
- {
- return true;
- }
-
/**
* Tells whether the "Next" button should be enabled interactively
* @return string A piece of javascript code returning either true or false