From c75969ca90b688ad46b4c76b1f98a89c9163688c Mon Sep 17 00:00:00 2001 From: Steve Joynt Date: Tue, 26 Nov 2024 11:19:07 +1100 Subject: [PATCH 1/2] FIX Allow for custom admin route (#1281) Fixes an issue saving inline editable content blocks if a custom admin route was set --- src/Controllers/ElementalAreaController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Controllers/ElementalAreaController.php b/src/Controllers/ElementalAreaController.php index 3a208e5c..4626fc3c 100644 --- a/src/Controllers/ElementalAreaController.php +++ b/src/Controllers/ElementalAreaController.php @@ -5,6 +5,7 @@ use DNADesign\Elemental\Forms\EditFormFactory; use DNADesign\Elemental\Models\BaseElement; use DNADesign\Elemental\Services\ElementTypeRegistry; +use SilverStripe\Admin\AdminRootController; use SilverStripe\CMS\Controllers\CMSMain; use SilverStripe\Control\HTTPRequest; use SilverStripe\Control\HTTPResponse; @@ -240,7 +241,7 @@ private function createElementForm(BaseElement $element): Form ); $urlSegment = $this->config()->get('url_segment'); - $form->setFormAction("admin/$urlSegment/elementForm/$id"); + $form->setFormAction(AdminRootController::admin_url("$urlSegment/elementForm/$id")); if (!$element->canEdit()) { $form->makeReadonly(); From 74195eaff775a971549213cf2fcb1814142400f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 21:37:54 +1300 Subject: [PATCH 2/2] Bump cross-spawn from 7.0.3 to 7.0.6 (#1279) Bumps [cross-spawn](https://github.com/moxystudio/node-cross-spawn) from 7.0.3 to 7.0.6. - [Changelog](https://github.com/moxystudio/node-cross-spawn/blob/master/CHANGELOG.md) - [Commits](https://github.com/moxystudio/node-cross-spawn/compare/v7.0.3...v7.0.6) --- updated-dependencies: - dependency-name: cross-spawn dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index b404c528..dd80ab0a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2932,9 +2932,9 @@ create-jest@^29.7.0: prompts "^2.0.1" cross-spawn@^7.0.2, cross-spawn@^7.0.3: - version "7.0.3" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" - integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== + version "7.0.6" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f" + integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA== dependencies: path-key "^3.1.0" shebang-command "^2.0.0"