Skip to content

Commit f28c5ac

Browse files
author
Rafael Grigorian
committed
Fixed #12
1 parent 2ccf59c commit f28c5ac

File tree

5 files changed

+6
-17
lines changed

5 files changed

+6
-17
lines changed

docker-compose.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ services:
2424
- VERBOSE=true
2525
links:
2626
- mysql
27-
- redis
2827
php-cli:
2928
image: jetrails/magento-alpine:php-cli-7.1
3029
volumes:
@@ -35,7 +34,6 @@ services:
3534
- php-cli.docker.internal
3635
links:
3736
- mysql
38-
- redis
3937
php-cron:
4038
image: jetrails/magento-alpine:php-cron-7.1
4139
restart: unless-stopped
@@ -49,7 +47,6 @@ services:
4947
- VERBOSE=false
5048
links:
5149
- mysql
52-
- redis
5350
nginx:
5451
image: jetrails/magento-alpine:nginx
5552
restart: unless-stopped
@@ -94,12 +91,3 @@ services:
9491
- nginx
9592
ports:
9693
- "80:80"
97-
redis:
98-
image: jetrails/magento-alpine:redis
99-
restart: unless-stopped
100-
networks:
101-
default:
102-
aliases:
103-
- redis.docker.internal
104-
environment:
105-
- VERBOSE=false

src/app/code/JetRails/Cloudflare/Controller/Adminhtml/Action.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace JetRails\Cloudflare\Controller\Adminhtml;
44

55
use Magento\Backend\App\Action\Context;
6-
use Magento\Framework\App\Action\Action as CoreAction;
6+
use Magento\Backend\App\Action as CoreAction;
77
use Magento\Framework\App\ObjectManager;
88
use Magento\Framework\Json\Helper\Data as JsonData;
99
use Magento\Framework\App\Request\Http;
@@ -63,6 +63,7 @@ protected function _getResourceName () {
6363
*/
6464
protected function _isAllowed () {
6565
$resource = $this->_getResourceName ();
66+
$resource = preg_replace ( "/^.+\//m", "", $resource );
6667
return $this->_authorization
6768
->isAllowed ("JetRails_Cloudflare::$resource");
6869
}

src/app/code/JetRails/Cloudflare/Controller/Adminhtml/Dashboard/Domain.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use JetRails\Cloudflare\Helper\Adminhtml\Data as DataHelper;
66
use Magento\Backend\App\Action\Context;
7-
use Magento\Framework\App\Action\Action;
7+
use Magento\Backend\App\Action;
88
use Magento\Framework\Session\SessionManagerInterface;
99

1010
/**

src/app/code/JetRails/Cloudflare/Controller/Adminhtml/Dashboard/Save.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use JetRails\Cloudflare\Helper\Adminhtml\Data as DataHelper;
66
use Magento\Backend\App\Action\Context;
7-
use Magento\Framework\App\Action\Action;
7+
use Magento\Backend\App\Action;
88

99
/**
1010
* This class extends from Magento's default controller action class and it

src/app/code/JetRails/Cloudflare/Controller/Adminhtml/Dashboard/View.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace JetRails\Cloudflare\Controller\Adminhtml\Dashboard;
44

55
use Magento\Backend\App\Action\Context;
6-
use Magento\Framework\App\Action\Action;
6+
use Magento\Backend\App\Action;
77
use Magento\Framework\View\Result\PageFactory;
88

99
/**
@@ -36,7 +36,7 @@ public function __construct (
3636
*/
3737
protected function _isAllowed () {
3838
return $this->_authorization
39-
->isAllowed ("JetRails_Cloudflare::dashboard");
39+
->isAllowed ("JetRails_Cloudflare::cloudflare");
4040
}
4141

4242
/**

0 commit comments

Comments
 (0)