From bb12873a195a7eaf6e0b0ef19e36b0b13e3b4f4b Mon Sep 17 00:00:00 2001
From: Ryan Cramer <ryan@rc-d.net>
Date: Sun, 16 Apr 2017 06:46:31 -0400
Subject: [PATCH] Fix issue with multi-template settings not always updating
 the selectable columns on columns tab

---
 .../Process/ProcessPageLister/ProcessPageLister.module      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/wire/modules/Process/ProcessPageLister/ProcessPageLister.module b/wire/modules/Process/ProcessPageLister/ProcessPageLister.module
index bf95a6e4..ee30379f 100644
--- a/wire/modules/Process/ProcessPageLister/ProcessPageLister.module
+++ b/wire/modules/Process/ProcessPageLister/ProcessPageLister.module
@@ -584,7 +584,7 @@ class ProcessPageLister extends Process implements ConfigurableModule {
 	 */
 	public function buildColumnsField() {
 
-		$fields = $this->template ? $this->template->fieldgroup : $this->wire('fields'); 
+		$fields = $this->wire('fields');
 		$options = $this->getSystemColumns();
 
 		/** @var InputfieldAsmSelect $f */
@@ -668,7 +668,7 @@ class ProcessPageLister extends Process implements ConfigurableModule {
 	 *
 	 */
 	protected function allowColumnField(Field $field) {
-		
+	
 		if(in_array($field->name, $this->disallowColumns)) return false;
 		if(count($this->limitFields) && !in_array($field->name, $this->limitFields)) {
 			if(!in_array($field->name, $this->columns)) return false;
@@ -1062,6 +1062,8 @@ class ProcessPageLister extends Process implements ConfigurableModule {
 			$subname = '';
 			if(strpos($name, '.')) list($name, $subname) = explode('.', $name);
 			$field = $this->template ? $this->template->fieldgroup->getField($name, true) : $this->fields->get($name);
+			if(!$field && $this->template) $field = $this->fields->get($name);
+			
 			$label = $field ? $field->getLabel() : '';
 			if(!$label) $label = isset($systemLabels[$name]) ? $systemLabels[$name] : $name;
 			$icon = $field ? $field->getIcon(true) : '';