diff --git a/datamodels/2.x/combodo-data-feature-removal/dictionaries/en.dict.combodo-data-feature-removal.php b/datamodels/2.x/combodo-data-feature-removal/dictionaries/en.dict.combodo-data-feature-removal.php index 6671932f97..665af838b4 100644 --- a/datamodels/2.x/combodo-data-feature-removal/dictionaries/en.dict.combodo-data-feature-removal.php +++ b/datamodels/2.x/combodo-data-feature-removal/dictionaries/en.dict.combodo-data-feature-removal.php @@ -10,29 +10,29 @@ */ Dict::Add('EN US', 'English', 'English', [ - 'Menu:DataFeatureRemovalMenu' => 'Features Removal', - 'combodo-data-feature-removal/Operation:Main/Title' => 'Features Removal', + 'Menu:DataFeatureRemovalMenu' => 'Extension management', + 'combodo-data-feature-removal/Operation:Main/Title' => 'Extension management', - 'DataFeatureRemoval:Main:Title' => 'Features Removal', - 'DataFeatureRemoval:Main:SubTitle' => 'Prepare features you want to enable/disable in a future setup', - 'DataFeatureRemoval:Failure:Title' => 'Feature dry removal errors', - 'DataFeatureRemoval:Helper:Title' => 'Enable or disable features that are installed in your iTop.', - 'DataFeatureRemoval:Helper:Desc1' => 'It will prepare the setup step that proceeds to feature enabling or disabling.', - 'DataFeatureRemoval:Helper:Desc2' => 'Analyze if there are any data or dependency preventing you from enabling/disabling a feature.', + 'DataFeatureRemoval:Main:Title' => 'Extension management', + 'DataFeatureRemoval:Main:SubTitle' => 'Toggle extensions installed on your iTop', + 'DataFeatureRemoval:Failure:Title' => 'Extensions dry removal errors', + 'DataFeatureRemoval:Helper:Title' => 'Analyze if there are any data or dependency preventing you from adding/removing an extension.', - 'DataFeatureRemoval:Features:Title' => 'Features', + 'DataFeatureRemoval:Features:Title' => 'Extensions', + 'DataFeatureRemoval:Result:Title' => 'Modification requested', 'DataFeatureRemoval:Execution:Title' => 'Deletion Executions', 'DataFeatureRemoval:Analysis:Title' => 'Analysis result', + 'DataFeatureRemoval:Analysis:Subtitle' => 'Review all elements requiring attention', 'DataFeatureRemoval:Analysis:SubTitle' => '%1$s element(s) to clean before continuing', - 'DataFeatureRemoval:DeletionPlan:Title' => 'Deletion plan', + 'DataFeatureRemoval:DeletionPlan:Title' => 'Data deletion plan', 'DataFeatureRemoval:DeletionPlan:SubTitle' => '%1$s rows to clean before continuing', 'DataFeatureRemoval:DoDeletion:Title' => 'Do deletion', 'DataFeatureRemoval:DoDeletion:SubTitle' => 'Remove all the entries from the database', 'DataFeatureRemoval:DeletionPlan:Error:Issues' => 'Some objects must be deleted manually prior to cleanup', 'DataFeatureRemoval:Table:Analysis:ClassName' => 'Element to remove', - 'DataFeatureRemoval:Table:Analysis:FeatureName' => 'Feature name', + 'DataFeatureRemoval:Table:Analysis:FeatureName' => 'Extension name', 'DataFeatureRemoval:Table:Analysis:Module' => 'Module name', 'DataFeatureRemoval:Table:Analysis:Occurrence' => 'Occurrence', @@ -40,12 +40,12 @@ 'DataFeatureRemoval:CompilComplete' => 'Compilation successful. No Cleanup needed. You can proceed to setup.', 'UI:Button:Analyze' => 'Analyze', - 'UI:Button:ModifyChoices' => 'Modify Choices', + 'UI:Button:ModifyChoices' => 'Change my selection', 'UI:Button:AnalyzeAndSetup' => 'Analyze and go to setup', - 'UI:Button:PlanDeletion' => 'Prepare deletion plan', - 'UI:Button:DoDeletion' => 'Delete data', - 'UI:Button:BackToMain' => 'Back to Feature Removal', - 'UI:Button:Setup' => 'Back to setup', + 'UI:Button:PlanDeletion' => 'Proceed with deletion', + 'UI:Button:DoDeletion' => 'Proceed with deletion', + 'UI:Button:BackToMain' => 'Change my selection', + 'UI:Button:Setup' => 'Run setup', 'UI:Action:ForceUninstall' => 'Force uninstall', 'UI:Action:MoreInfo' => 'More information', diff --git a/datamodels/2.x/combodo-data-feature-removal/dictionaries/fr.dict.combodo-data-feature-removal.php b/datamodels/2.x/combodo-data-feature-removal/dictionaries/fr.dict.combodo-data-feature-removal.php index c6a65b50f0..eba10a30da 100644 --- a/datamodels/2.x/combodo-data-feature-removal/dictionaries/fr.dict.combodo-data-feature-removal.php +++ b/datamodels/2.x/combodo-data-feature-removal/dictionaries/fr.dict.combodo-data-feature-removal.php @@ -10,29 +10,29 @@ */ Dict::Add('FR FR', 'French', 'Français', [ - 'Menu:DataFeatureRemovalMenu' => 'Suppression de fonctionnalités', - 'combodo-data-feature-removal/Operation:Main/Title' => 'Suppression de fonctionnalités', + 'Menu:DataFeatureRemovalMenu' => 'Gestion des extensions', + 'combodo-data-feature-removal/Operation:Main/Title' => 'Gestion des extensions', - 'DataFeatureRemoval:Main:Title' => 'Suppression de fonctionnalités', - 'DataFeatureRemoval:Main:SubTitle' => 'Préparez les fonctionnalités que vous souhaitez activer ou désactiver lors d’une prochaine configuration', - 'DataFeatureRemoval:Failure:Title' => 'Erreurs lors de la simulation de suppression de fonctionnalités', - 'DataFeatureRemoval:Helper:Title' => 'Activez ou désactivez les fonctionnalités installées dans votre iTop.', - 'DataFeatureRemoval:Helper:Desc1' => 'Cette étape prépare l’assistant de configuration à activer ou désactiver des fonctionnalités.', - 'DataFeatureRemoval:Helper:Desc2' => 'Analyse si des données ou des dépendances empêchent l’activation ou la désactivation d’une fonctionnalité.', + 'DataFeatureRemoval:Main:Title' => 'Gestion des extensions', + 'DataFeatureRemoval:Main:SubTitle' => 'Sélectionner les extensions à installer sur votre iTop', + 'DataFeatureRemoval:Failure:Title' => 'Erreurs lors de la simulation de suppression d\'extensions', + 'DataFeatureRemoval:Helper:Title' => 'Activez ou désactivez les extensions installées dans votre iTop.', - 'DataFeatureRemoval:Features:Title' => 'Fonctionnalités', + 'DataFeatureRemoval:Features:Title' => 'Extensions', + 'DataFeatureRemoval:Result:Title' => 'Modification demandée', 'DataFeatureRemoval:Execution:Title' => 'Suppressions', 'DataFeatureRemoval:Analysis:Title' => 'Résultat de l’analyse', + 'DataFeatureRemoval:Analysis:Subtitle' => 'Vérifier les éléments à nettoyer', 'DataFeatureRemoval:Analysis:SubTitle' => '%1$s élément(s) à nettoyer avant de poursuivre', - 'DataFeatureRemoval:DeletionPlan:Title' => 'Plan de suppression', + 'DataFeatureRemoval:DeletionPlan:Title' => 'Plan de suppression des données', 'DataFeatureRemoval:DeletionPlan:SubTitle' => '%1$s ligne(s) à nettoyer avant de poursuivre', 'DataFeatureRemoval:DoDeletion:Title' => 'Exécuter la suppression', 'DataFeatureRemoval:DoDeletion:SubTitle' => 'Supprime toutes les entrées de la base de données', 'DataFeatureRemoval:DeletionPlan:Error:Issues' => 'Certains objets doivent être supprimés manuellement avant le nettoyage', 'DataFeatureRemoval:Table:Analysis:ClassName' => 'Élément à supprimer', - 'DataFeatureRemoval:Table:Analysis:FeatureName' => 'Fonctionnalité', + 'DataFeatureRemoval:Table:Analysis:FeatureName' => 'Extension', 'DataFeatureRemoval:Table:Analysis:Module' => 'Module', 'DataFeatureRemoval:Table:Analysis:Occurrence' => 'Occurrence', @@ -40,12 +40,12 @@ 'DataFeatureRemoval:CompilComplete' => 'Compilation successful. No Cleanup needed. You can proceed to setup.', 'UI:Button:Analyze' => 'Analyser', - 'UI:Button:ModifyChoices' => 'Modifier les choix', + 'UI:Button:ModifyChoices' => 'Modifier la sélection', 'UI:Button:AnalyzeAndSetup' => 'Analyser et ouvrir l’assistant de configuration', - 'UI:Button:PlanDeletion' => 'Préparer le plan de suppression', + 'UI:Button:PlanDeletion' => 'Supprimer les données', 'UI:Button:DoDeletion' => 'Supprimer les données', - 'UI:Button:BackToMain' => 'Retour à la suppression de fonctionnalités', - 'UI:Button:Setup' => 'Retour à l’assistant de configuration', + 'UI:Button:BackToMain' => 'Modifier la sélection', + 'UI:Button:Setup' => 'Lancer le setup', 'UI:Action:ForceUninstall' => 'Forcer la désinstallation', 'UI:Action:MoreInfo' => 'Plus d’informations', diff --git a/datamodels/2.x/combodo-data-feature-removal/templates/AnalysisResult.html.twig b/datamodels/2.x/combodo-data-feature-removal/templates/AnalysisResult.html.twig index 8bebc67108..9d5bb1c64a 100644 --- a/datamodels/2.x/combodo-data-feature-removal/templates/AnalysisResult.html.twig +++ b/datamodels/2.x/combodo-data-feature-removal/templates/AnalysisResult.html.twig @@ -3,14 +3,14 @@ -{% UIPanel ForInformation { sTitle:'DataFeatureRemoval:Analysis:Title'|dict_s} %} +{% UIPanel ForInformation { sTitle:'DataFeatureRemoval:Analysis:Title'|dict_s, sSubTitle: 'DataFeatureRemoval:Analysis:Subtitle'|dict_s} %} {% if null != DataFeatureRemovalErrorMessage %}
{% UIAlert ForFailure { sTitle:'DataFeatureRemoval:Failure:Title'|dict_s, sId: 'feature_removal_error_msg', sContent:DataFeatureRemovalErrorMessage } %} {% EndUIAlert %}
- {% UIPanel Neutral { sTitle:'DataFeatureRemoval:Features:Title'|dict_s, sSubTitle: '' } %} + {% UIPanel Neutral { sTitle:'DataFeatureRemoval:Result:Title'|dict_s, sSubTitle: '' } %} {% UIMultiColumn Standard {} %} {% for iColumnIndex in 0..iColumnCount-1 %} {% UIColumn Standard {} %} @@ -26,7 +26,7 @@ {% EndUIMultiColumn %} {% EndUIPanel %} {% else %} - {% UIPanel Neutral { sTitle:'DataFeatureRemoval:Features:Title'|dict_s, sSubTitle: '' } %} + {% UIPanel Neutral { sTitle:'DataFeatureRemoval:Result:Title'|dict_s, sSubTitle: '' } %} {% UIMultiColumn Standard {} %} {% for iColumnIndex in 0..iColumnCount-1 %} {% UIColumn Standard {} %} diff --git a/datamodels/2.x/combodo-data-feature-removal/templates/Main.html.twig b/datamodels/2.x/combodo-data-feature-removal/templates/Main.html.twig index 04ae95101c..7d71bf00eb 100644 --- a/datamodels/2.x/combodo-data-feature-removal/templates/Main.html.twig +++ b/datamodels/2.x/combodo-data-feature-removal/templates/Main.html.twig @@ -11,8 +11,6 @@ {% UIPanel ForInformation { sTitle:'DataFeatureRemoval:Main:Title'|dict_s, sSubTitle: 'DataFeatureRemoval:Main:SubTitle'|dict_s } %} {% UIAlert ForInformation { sTitle:'DataFeatureRemoval:Helper:Title'|dict_s } %} - {{ 'DataFeatureRemoval:Helper:Desc1'|dict_s }}
- {{ 'DataFeatureRemoval:Helper:Desc2'|dict_s }} {% EndUIAlert %} {% include 'Features.html.twig' %} diff --git a/setup/runtimeenv.class.inc.php b/setup/runtimeenv.class.inc.php index c3b31401fc..846ccc0182 100644 --- a/setup/runtimeenv.class.inc.php +++ b/setup/runtimeenv.class.inc.php @@ -1339,7 +1339,7 @@ public function DataToCleanupAudit() $iCount = $oSetupAudit->GetDataToCleanupCount(); if ($iCount > 0) { - throw new Exception("$iCount elements require data adjustments or cleanup in the backoffice prior to upgrading iTop", DataAuditSequencer::DATA_AUDIT_FAILED); + throw new Exception("$iCount elements require data adjustments or cleanup in the backoffice", DataAuditSequencer::DATA_AUDIT_FAILED); } } diff --git a/setup/wizardsteps/AbstractWizStepMiscParams.php b/setup/wizardsteps/AbstractWizStepMiscParams.php index 81c7ba2f4a..5662bf500b 100644 --- a/setup/wizardsteps/AbstractWizStepMiscParams.php +++ b/setup/wizardsteps/AbstractWizStepMiscParams.php @@ -44,12 +44,29 @@ final protected function AddForceUninstallFlagOption(WebPage $oPage): void { $sChecked = $this->oWizard->GetParameter('force-uninstall', false) ? ' checked ' : ''; $oPage->add('
'); - $oPage->add('Advanced parameters'); - $oPage->p('
'); + $oPage->add('
'); + $oPage->add(''); + $oPage->add('
'); + $oPage->add(''); + $oPage->add('
This could result in data corruption and application crashes.
'); + $oPage->add('
'); + $oPage->add('
'); + $oPage->add(''); + $oPage->add_style( + <<add_ready_script( <<<'JS' +$("[data-role=\"setup-collapsable-options--toggler\"").on('click', function() { + var $tbody = $(this).closest("div"); + $tbody.children().not(":first-child").toggle(); + $tbody.toggleClass('setup-is-opened'); +}); $("#force-uninstall").on("click", function() { let $this = $(this); let bForceUninstall = $this.prop("checked"); diff --git a/setup/wizardsteps/WizStepDataAudit.php b/setup/wizardsteps/WizStepDataAudit.php index d6288d87a1..e7f49dba14 100644 --- a/setup/wizardsteps/WizStepDataAudit.php +++ b/setup/wizardsteps/WizStepDataAudit.php @@ -134,14 +134,16 @@ protected function AddProgressErrorScript($oPage, $aRes) if (isset($aRes['error_code']) && $aRes['error_code'] === DataAuditSequencer::DATA_AUDIT_FAILED) { $oPage->add_ready_script( <<'); - - $('.ibo-setup--wizard--buttons-container tr td:nth-child(2)').after(' '); + $('.ibo-setup--wizard--buttons-container tr td:nth-child(2)').before(''); + $('#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(' '); $('#goto-data-feature-removal').on("click", function() { $('#goto-data-feature-removal').prop('disabled', true); $('#submit-wait').removeClass("ibo-is-hidden"); $('#data-feature-removal').submit(); - }) + }); $("#wiz_form").data("installation_status", "cleanup_needed"); $('#btn_next').hide();