From cafb3cd1ee47c824fa929f3ee9373592a22045de Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Mon, 9 Nov 2020 17:21:35 +0100 Subject: [PATCH] =?UTF-8?q?bug=20=C3=A9dition=20de=20page=20bouton=20optio?= =?UTF-8?q?n=20du=20module=20d=C3=A9sactiv=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 4 ++++ core/core.php | 2 +- core/module/page/view/edit/edit.js.php | 6 +++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 5620dcce..c0cef218 100755 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,9 @@ # Changelog +## version 10.3.06 +- Correction : + - Edition de page avec module, le changement de mise en page désactive le bouton d'option du module. + ## version 10.3.05 - Correction : - Thème : import d'un thème d'administration impossible. diff --git a/core/core.php b/core/core.php index 8154702f..c9f96495 100644 --- a/core/core.php +++ b/core/core.php @@ -39,7 +39,7 @@ class common { const ACCESS_TIMER = 1800; // Numéro de version - const ZWII_VERSION = '10.3.05'; + const ZWII_VERSION = '10.3.06'; const ZWII_UPDATE_CHANNEL = "v10"; public static $actions = []; diff --git a/core/module/page/view/edit/edit.js.php b/core/module/page/view/edit/edit.js.php index bc1da193..941b24a0 100644 --- a/core/module/page/view/edit/edit.js.php +++ b/core/module/page/view/edit/edit.js.php @@ -451,7 +451,6 @@ pageEditBlockDOM.on("change", function() { $("#pageEditAdvancedWrapper").slideDown(); $("#pageEditModuleIdWrapper").addClass("disabled"); $("#pageEditModuleIdWrapper").slideDown(); - $("#pageEditModuleConfig").addClass("disabled"); $("#pageEditModuleConfig").slideDown(); $("#pageEditDisplayMenuWrapper").removeClass("disabled"); $("#pageEditDisplayMenuWrapper").slideUp(); @@ -459,6 +458,11 @@ pageEditBlockDOM.on("change", function() { $("#pageEditbreadCrumbWrapper").addClass("disabled"); $("#pageEditbreadCrumbWrapper").slideDown(); } + if ($("#pageEditModuleId").val() === "") { + $("#pageEditModuleConfig").addClass("disabled"); + } else { + $("#pageEditModuleConfig").removeClass("disabled"); + } /* $("#pageEditBlockLayout").removeClass("col12"); $("#pageEditBlockLayout").addClass("col6");