From 62f34f9f4d38eeaa1d72fdcb1b4a3e0c8783492b Mon Sep 17 00:00:00 2001 From: ElectricMaxxx Date: Thu, 27 Apr 2017 22:11:23 +0200 Subject: [PATCH 1/4] use doctrine-phpcr-sonata routing for tree reorder --- app/config/routing.yml | 4 ++++ web/config.php | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/config/routing.yml b/app/config/routing.yml index 1d7620fc..2cd56f28 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -52,3 +52,7 @@ block_cache: cmf_resource: resource: '@CmfResourceRestBundle/Resources/config/routing.yml' prefix: /admin + +cmf_tree: + resource: '@SonataDoctrinePHPCRAdminBundle/Resources/config/routing/tree.xml' + prefix: /admin diff --git a/web/config.php b/web/config.php index 9de1e88a..69df43cf 100644 --- a/web/config.php +++ b/web/config.php @@ -14,10 +14,10 @@ exit('This script cannot be run from the CLI. Run it from a browser.'); } -if (!in_array(@$_SERVER['REMOTE_ADDR'], [ +if (!in_array(@$_SERVER['REMOTE_ADDR'], array( '127.0.0.1', '::1', -])) { +))) { header('HTTP/1.0 403 Forbidden'); exit('This script is only accessible from localhost.'); } From a5f918283e940ee6c694cb3feadf1a8c49507a58 Mon Sep 17 00:00:00 2001 From: ElectricMaxxx Date: Thu, 27 Apr 2017 22:27:00 +0200 Subject: [PATCH 2/4] use both changes --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 08b56b16..3b481eeb 100644 --- a/composer.json +++ b/composer.json @@ -49,7 +49,8 @@ "eko/feedbundle": "^1.2.7", "lunetics/locale-bundle": "^2.5", "burgov/key-value-form-bundle": "^1.4", - "egeloen/ckeditor-bundle": "^4.0" + "egeloen/ckeditor-bundle": "^4.0", + "symfony-cmf/tree-browser-bundle": "dev-fix_dnd as 2.0" }, "require-dev": { "sensio/generator-bundle": "^3.0", From 9abf84e3bd8e9817afffb060c8947fc415cfb927 Mon Sep 17 00:00:00 2001 From: ElectricMaxxx Date: Mon, 1 May 2017 07:13:23 +0200 Subject: [PATCH 3/4] get the move working --- app/config/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/config.yml b/app/config/config.yml index f98d4538..06248386 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -117,7 +117,7 @@ cmf_menu: cmf_resource: description: - enhancers: [sonata_phpcr_admin, cmf_tree_icons] + enhancers: [sonata_phpcr_admin, cmf_tree_icons, doctrine_phpcr_position] repositories: default: type: doctrine/phpcr-odm From 624e98945db440bff17ef080c91f455d753ac66f Mon Sep 17 00:00:00 2001 From: ElectricMaxxx Date: Mon, 1 May 2017 22:44:30 +0200 Subject: [PATCH 4/4] clean history --- app/config/config.yml | 2 +- app/config/routing.yml | 3 --- composer.json | 3 +-- web/config.php | 4 ++-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/app/config/config.yml b/app/config/config.yml index 06248386..f98d4538 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -117,7 +117,7 @@ cmf_menu: cmf_resource: description: - enhancers: [sonata_phpcr_admin, cmf_tree_icons, doctrine_phpcr_position] + enhancers: [sonata_phpcr_admin, cmf_tree_icons] repositories: default: type: doctrine/phpcr-odm diff --git a/app/config/routing.yml b/app/config/routing.yml index 2cd56f28..e76af29e 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -53,6 +53,3 @@ cmf_resource: resource: '@CmfResourceRestBundle/Resources/config/routing.yml' prefix: /admin -cmf_tree: - resource: '@SonataDoctrinePHPCRAdminBundle/Resources/config/routing/tree.xml' - prefix: /admin diff --git a/composer.json b/composer.json index 3b481eeb..08b56b16 100644 --- a/composer.json +++ b/composer.json @@ -49,8 +49,7 @@ "eko/feedbundle": "^1.2.7", "lunetics/locale-bundle": "^2.5", "burgov/key-value-form-bundle": "^1.4", - "egeloen/ckeditor-bundle": "^4.0", - "symfony-cmf/tree-browser-bundle": "dev-fix_dnd as 2.0" + "egeloen/ckeditor-bundle": "^4.0" }, "require-dev": { "sensio/generator-bundle": "^3.0", diff --git a/web/config.php b/web/config.php index 69df43cf..9de1e88a 100644 --- a/web/config.php +++ b/web/config.php @@ -14,10 +14,10 @@ exit('This script cannot be run from the CLI. Run it from a browser.'); } -if (!in_array(@$_SERVER['REMOTE_ADDR'], array( +if (!in_array(@$_SERVER['REMOTE_ADDR'], [ '127.0.0.1', '::1', -))) { +])) { header('HTTP/1.0 403 Forbidden'); exit('This script is only accessible from localhost.'); }