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

Some code adjustments in ProcessPageList to support a separate renderReady() method, as well as some tweaks per @EntitySelf evernote document

Browse Source
This commit is contained in:
Ryan Cramer
2017-10-13 08:17:32 -04:00
parent 5dc690af9e
commit 00c183e70f
9 changed files with 88 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wire/core/ProcessWire.php
View File

@@ -804,7 +804,7 @@ class ProcessWire extends Wire {
unset($sf, $f, $x);
// when internal is true, we are not being called by an external script
$cfg['internal'] = $realIndexFile == $realScriptFile;
$cfg['internal'] = strtolower($realIndexFile) == strtolower($realScriptFile);
} else {
// when included from another app or command line script

2
wire/core/WireDebugInfo.php
View File

@@ -91,7 +91,7 @@ class WireDebugInfo extends Wire {
* @return array
*
*/
protected function Page(Page $page) {
public function Page(Page $page) {
$info = array(
'instanceID' => $page->instanceID,

2
wire/modules/Fieldtype/FieldtypeCache.module
View File

@@ -171,7 +171,7 @@ class FieldtypeCache extends Fieldtype {
$select->label = 'Fields to cache';
$select->description = 'Select all fields that you would like to be cached.';
$select->notes =
"If you don't have 'autojoin' checked under this field's advanced settings, the you will have to " .
"If you don't have 'autojoin' checked under this field's advanced settings, then you will have to " .
"call \$page->{$field->name} before the cached fields will be loaded.";
foreach($this->fields as $f) {

3
wire/modules/Inputfield/InputfieldFile/InputfieldFile.module
View File

@@ -773,7 +773,8 @@ class InputfieldFile extends Inputfield implements InputfieldItemList, Inputfiel
}
protected function ___processInputDeleteFile(Pagefile $pagefile) {
$this->message($this->_("Deleted file:") . " $pagefile"); // Label that precedes a deleted filename
$fileLabel = $this->wire('config')->debug ? $pagefile->url() : $pagefile->name;
$this->message($this->_("Deleted file:") . " $fileLabel"); // Label that precedes a deleted filename
$this->value->delete($pagefile);
$this->trackChange('value');
}

1
wire/modules/Inputfield/InputfieldPageListSelect/InputfieldPageListSelect.module
View File

@@ -42,6 +42,7 @@ class InputfieldPageListSelect extends Inputfield implements InputfieldPageListS
/** @var ProcessPageList $process */
$process = $this->wire('modules')->get('ProcessPageList'); // prerequisite module
$process->setPageLabelField($this->attr('name'), $this->labelFieldName);
$process->renderReady();
}
return parent::renderReady($parent, $renderValueMode);
}

1
wire/modules/Inputfield/InputfieldPageListSelect/InputfieldPageListSelectMultiple.module
View File

@@ -64,6 +64,7 @@ class InputfieldPageListSelectMultiple extends Inputfield
/** @var ProcessPageList $process */
$process = $this->wire('modules')->get('ProcessPageList'); // prerequisite module
$process->setPageLabelField($this->attr('name'), $this->labelFieldName);
$process->renderReady();
}
return parent::renderReady($parent, $renderValueMode);
}

4
wire/modules/Process/ProcessPageList/ProcessPageList.js
View File

@@ -141,6 +141,10 @@ $(document).ready(function() {
var isModal = $("body").hasClass("modal") || $("body").hasClass("pw-iframe");
if(typeof ProcessWire.config.ProcessPageList != "undefined") {
$.extend(options, ProcessWire.config.ProcessPageList);
}
$.extend(options, customOptions);
return this.each(function(index) {

2
wire/modules/Process/ProcessPageList/ProcessPageList.min.js vendored
View File

File diff suppressed because one or more lines are too long

112
wire/modules/Process/ProcessPageList/ProcessPageList.module
View File

@@ -212,52 +212,79 @@ class ProcessPageList extends Process implements ConfigurableModule {
protected function render() {
$this->setupBreadcrumbs();
if($this->render) return $this->getPageListRender($this->page)->render();
if($this->render) {
return $this->getPageListRender($this->page)->render();
}
$session = $this->wire('session');
$input = $this->wire('input');
$isAjax = $this->wire('config')->ajax;
$tokenName = $session->CSRF->getTokenName();
$tokenValue = $session->CSRF->getTokenValue();
$class = $this->id ? "PageListContainerPage" : "PageListContainerRoot";
$script = '';
$this->renderReady();
if($isAjax && $input->get('renderInputfieldAjax')) {
$script = "<script>ProcessPageListInit();</script>";
}
return "\n" .
"<div id='PageListContainer' " .
"class='$class' " .
"data-token-name='$tokenName' " . // CSRF tokens
"data-token-value='$tokenValue'>" .
"</div>$script";
}
/**
* Setup for render
*
*/
public function renderReady() {
$input = $this->wire('input');
$config = $this->wire('config');
$session = $this->wire('session');
$urls = $config->urls;
$isAjax = $config->ajax;
$openPageIDs = array();
$openPageData = array();
$script = '';
if($this->openPage->id > 1) {
$openPageIDs[] = $this->openPage->id;
foreach($this->openPage->parents() as $parent) {
if($parent->id > 1 && $parent->id != $this->id) $openPageIDs[] = $parent->id;
}
} else if(!$isAjax && $this->wire('page')->process == $this) {
if($this->id) {
// leave openPageIDs as empty array
} else {
$openPageIDs = $input->cookie->array('pagelist_open');
}
}
if($isAjax) {
if($input->get('renderInputfieldAjax')) {
$script = "<script>ProcessPageListInit();</script>";
}
} else if(count($openPageIDs)) {
$render = $this->render;
$this->render = 'JSON';
foreach($openPageIDs as $key => $openPageID) {
if(strpos($openPageID, '-')) {
list($openPageID, $openPageStart) = explode('-', $openPageID);
$openPageStart = (int) $openPageStart;
} else {
$openPageStart = 0;
if($this->openPage) {
if($this->openPage->id > 1) {
$openPageIDs[] = $this->openPage->id;
foreach($this->openPage->parents() as $parent) {
if($parent->id > 1 && $parent->id != $this->id) $openPageIDs[] = $parent->id;
}
} else if(!$isAjax && $this->wire('page')->process == $this) {
if($this->id) {
// leave openPageIDs as empty array
} else {
$openPageIDs = $input->cookie->array('pagelist_open');
}
$openPageID = (int) $openPageID;
$openPageIDs[$key] = "$openPageID-$openPageStart";
$p = $this->wire('pages')->get($openPageID);
if(!$p->id || !$p->listable()) continue;
$renderer = $this->getPageListRender($p, $this->limit, $openPageStart);
$openPageData["$openPageID-$openPageStart"] = $renderer->setOption('getArray', true)->render();
}
$this->render = $render;
if(!$isAjax && count($openPageIDs)) {
$render = $this->render;
$this->render = 'JSON';
foreach($openPageIDs as $key => $openPageID) {
if(strpos($openPageID, '-')) {
list($openPageID, $openPageStart) = explode('-', $openPageID);
$openPageStart = (int) $openPageStart;
} else {
$openPageStart = 0;
}
$openPageID = (int) $openPageID;
$openPageIDs[$key] = "$openPageID-$openPageStart";
$p = $this->wire('pages')->get($openPageID);
if(!$p->id || !$p->listable()) continue;
$renderer = $this->getPageListRender($p, $this->limit, $openPageStart);
$openPageData["$openPageID-$openPageStart"] = $renderer->setOption('getArray', true)->render();
}
$this->render = $render;
}
}
$defaults = array(
@@ -285,21 +312,10 @@ class ProcessPageList extends Process implements ConfigurableModule {
'trashLabel' => $this->trashLabel,
'ajaxNetworkError' => $this->_('Network error, please try again later'), // Network error during AJAX request
'ajaxUnknownError' => $this->_('Unknown error, please try again later'), // Unknown error during AJAX request
);
);
$settings = $config->ProcessPageList;
$settings = is_array($settings) ? array_merge($defaults, $settings) : $defaults;
$config->js('ProcessPageList', $settings);
$tokenName = $session->CSRF->getTokenName();
$tokenValue = $session->CSRF->getTokenValue();
$class = $this->id ? "PageListContainerPage" : "PageListContainerRoot";
return "\n" .
"<div id='PageListContainer' " .
"class='$class' " .
"data-token-name='$tokenName' " . // CSRF tokens
"data-token-value='$tokenValue'>" .
"</div>$script";
}
/**