mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-10 00:37:02 +02:00
Code Issues Releases Wiki Activity

Update for processwire/processwire-issues#1780

Browse Source
This commit is contained in:
Ryan Cramer
2023-07-12 11:27:35 -04:00
parent a53e809fc4
commit fa5fae9c58
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
wire/modules/Process/ProcessPageType/ProcessPageType.module
View File

@@ -155,11 +155,15 @@ class ProcessPageType extends Process implements ConfigurableModule, WirePageEdi
} }
} }
if(!$this->lister && $modules->isInstalled('ProcessPageLister')) { if(!$this->lister && $modules->isInstalled('ProcessPageLister')) {
$this->lister = $modules->get('ProcessPageLister'); // for regular Lister we init() in the getLister() method instead
$this->lister = $modules->getModule('ProcessPageLister', array('noInit' => true));
} }
} }
if($this->lister && $bookmarkID) { if($this->lister && $bookmarkID) {
if($this->lister->className() === 'ProcessPageLister') {
$this->lister->set('_' . $this->className(), true)->init();
}
$bookmarks = $this->lister->getBookmarksInstance(); $bookmarks = $this->lister->getBookmarksInstance();
$bookmarkID = $bookmarks->_bookmarkID(ltrim($bookmarkID, 'bm')); $bookmarkID = $bookmarks->_bookmarkID(ltrim($bookmarkID, 'bm'));
$this->listerBookmarkID = $this->lister->checkBookmark($bookmarkID); $this->listerBookmarkID = $this->lister->checkBookmark($bookmarkID);
@@ -311,12 +315,16 @@ class ProcessPageType extends Process implements ConfigurableModule, WirePageEdi
} }
if($lister->className() == 'ProcessPageListerPro') { if($lister->className() == 'ProcessPageListerPro') {
$data = $this->wire('modules')->getModuleConfigData('ProcessPageListerPro'); // ProcessPageListerPro only
$data = $this->wire()->modules->getConfig('ProcessPageListerPro');
if(isset($data['settings'][$this->page->name])) { if(isset($data['settings'][$this->page->name])) {
foreach($data['settings'][$this->page->name] as $key => $value) { foreach($data['settings'][$this->page->name] as $key => $value) {
$lister->$key = $value; $lister->$key = $value;
} }
} }
} else if(!$lister->get('_' . $this->className())) {
// ProcessPageLister only
$lister->set('_'. $this->className(), true)->init(); // because it used noInit option on get()
} }
return $lister; return $lister;
@@ -763,4 +771,3 @@ class ProcessPageType extends Process implements ConfigurableModule, WirePageEdi
} }
} }