Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Add admin.js to all admin pages using AssetController

Browse Source 
[MAILPOET-4908]
This commit is contained in:
Sam Najian
2023-01-06 11:39:40 +01:00
committed by Aschepikov
parent 0a11fadb05
commit c9c75c8c6d
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mailpoet/lib/AdminPages/PageRenderer.php
View File

@@ -12,6 +12,7 @@ use MailPoet\Cron\Workers\SubscribersCountCacheRecalculation;
use MailPoet\Entities\SegmentEntity; use MailPoet\Entities\SegmentEntity;
use MailPoet\Entities\TagEntity; use MailPoet\Entities\TagEntity;
use MailPoet\Features\FeaturesController; use MailPoet\Features\FeaturesController;
use MailPoet\Form\AssetsController;
use MailPoet\Referrals\ReferralDetector; use MailPoet\Referrals\ReferralDetector;
use MailPoet\Segments\SegmentsRepository; use MailPoet\Segments\SegmentsRepository;
use MailPoet\Services\Bridge; use MailPoet\Services\Bridge;
@@ -70,6 +71,9 @@ class PageRenderer {
/** @var WPFunctions */ /** @var WPFunctions */
private $wp; private $wp;
/*** @var AssetsController */
private $assetsController;
public function __construct( public function __construct(
Bridge $bridge, Bridge $bridge,
Renderer $renderer, Renderer $renderer,
@@ -84,7 +88,8 @@ class PageRenderer {
SubscribersFeature $subscribersFeature, SubscribersFeature $subscribersFeature,
TrackingConfig $trackingConfig, TrackingConfig $trackingConfig,
TransientCache $transientCache, TransientCache $transientCache,
WPFunctions $wp WPFunctions $wp,
AssetsController $assetsController
) { ) {
$this->bridge = $bridge; $this->bridge = $bridge;
$this->renderer = $renderer; $this->renderer = $renderer;
@@ -100,6 +105,7 @@ class PageRenderer {
$this->trackingConfig = $trackingConfig; $this->trackingConfig = $trackingConfig;
$this->transientCache = $transientCache; $this->transientCache = $transientCache;
$this->wp = $wp; $this->wp = $wp;
$this->assetsController = $assetsController;
} }
/** /**
@@ -193,6 +199,7 @@ class PageRenderer {
$this->subscribersCountCacheRecalculation->schedule(); $this->subscribersCountCacheRecalculation->schedule();
} }
$this->assetsController->setupAdminPagesDependencies();
// We are in control of the template and the data can be considered safe at this point // We are in control of the template and the data can be considered safe at this point
// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped, WordPressDotOrg.sniffs.OutputEscaping.UnescapedOutputParameter // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped, WordPressDotOrg.sniffs.OutputEscaping.UnescapedOutputParameter
echo $this->renderer->render($template, $data + $defaults); echo $this->renderer->render($template, $data + $defaults);

9
mailpoet/lib/AdminPages/Pages/Newsletters.php
View File

@@ -8,7 +8,6 @@ use MailPoet\Config\Env;
use MailPoet\Config\Installer; use MailPoet\Config\Installer;
use MailPoet\Config\Menu; use MailPoet\Config\Menu;
use MailPoet\Entities\NewsletterEntity; use MailPoet\Entities\NewsletterEntity;
use MailPoet\Form\AssetsController;
use MailPoet\Listing\PageLimit; use MailPoet\Listing\PageLimit;
use MailPoet\Newsletter\NewslettersRepository; use MailPoet\Newsletter\NewslettersRepository;
use MailPoet\NewsletterTemplates\NewsletterTemplatesRepository; use MailPoet\NewsletterTemplates\NewsletterTemplatesRepository;
@@ -55,9 +54,6 @@ class Newsletters {
/** @var AuthorizedSenderDomainController */ /** @var AuthorizedSenderDomainController */
private $senderDomainController; private $senderDomainController;
/*** @var AssetsController */
private $assetsController;
public function __construct( public function __construct(
PageRenderer $pageRenderer, PageRenderer $pageRenderer,
PageLimit $listingPageLimit, PageLimit $listingPageLimit,
@@ -69,8 +65,7 @@ class Newsletters {
SegmentsSimpleListRepository $segmentsListRepository, SegmentsSimpleListRepository $segmentsListRepository,
NewslettersRepository $newslettersRepository, NewslettersRepository $newslettersRepository,
Bridge $bridge, Bridge $bridge,
AuthorizedSenderDomainController $senderDomainController, AuthorizedSenderDomainController $senderDomainController
AssetsController $assetsController
) { ) {
$this->pageRenderer = $pageRenderer; $this->pageRenderer = $pageRenderer;
$this->listingPageLimit = $listingPageLimit; $this->listingPageLimit = $listingPageLimit;
@@ -83,13 +78,11 @@ class Newsletters {
$this->newslettersRepository = $newslettersRepository; $this->newslettersRepository = $newslettersRepository;
$this->bridge = $bridge; $this->bridge = $bridge;
$this->senderDomainController = $senderDomainController; $this->senderDomainController = $senderDomainController;
$this->assetsController = $assetsController;
} }
public function render() { public function render() {
global $wp_roles; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps global $wp_roles; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
$this->assetsController->setupAdminPagesDependencies();
$data = []; $data = [];
$data['items_per_page'] = $this->listingPageLimit->getLimitPerPage('newsletters'); $data['items_per_page'] = $this->listingPageLimit->getLimitPerPage('newsletters');