Make the errors layout a base layout

Author: Michael Babker

administrator/components/com_patchtester/PatchTester/View/Pulls/PullsHtmlView.php

@@ -88,6 +88,12 @@ public function render()
 			$this->trackerAlias = TrackerHelper::getTrackerAlias($this->state->get('github_user'), $this->state->get('github_repo'));
 		}
 
+		// Change the layout if there are environment errors
+		if (count($this->envErrors))
+		{
+			$this->setLayout('errors');
+		}
+
 		$this->addToolbar();
 
 		// Make text strings available in the JavaScript API

administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default.php

@@ -14,9 +14,6 @@
 \JHtml::_('stylesheet', 'com_patchtester/octicons.css', array('version' => 'auto', 'relative' => true));
 \JHtml::_('script', 'com_patchtester/patchtester.js', array('version' => 'auto', 'relative' => true));
 
-if (count($this->envErrors)) :
-	echo $this->loadTemplate('errors');
-else :
 $listOrder     = $this->escape($this->state->get('list.ordering'));
 $listDirn      = $this->escape($this->state->get('list.direction'));
 $filterApplied = $this->escape($this->state->get('filter.applied'));
@@ -126,4 +123,3 @@
 		<?php echo \JHtml::_('form.token'); ?>
 	</div>
 </form>
-<?php endif;

…ester/View/Pulls/tmpl/default_errors.php …r/PatchTester/View/Pulls/tmpl/errors.phpadministrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default_errors.php renamed to administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/errors.php administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default_errors.php renamed to administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/errors.php

@@ -6,7 +6,7 @@
  * @license    GNU General Public License version 2 or later
  */
 
-/** @var \PatchTester\View\DefaultHtmlView $this */
+/** @var  \PatchTester\View\Pulls\PullsHtmlView  $this */
 ?>
 <h3><?php echo \JText::_('COM_PATCHTESTER_REQUIREMENTS_HEADING'); ?></h3>
 <p><?php echo \JText::_('COM_PATCHTESTER_REQUIREMENTS_NOT_MET'); ?></p>

administrator/components/com_patchtester/script.php

@@ -31,6 +31,10 @@ public function __construct()
 		$this->minimumJoomla = '3.7';
 		$this->minimumPhp    = JOOMLA_MINIMUM_PHP;
 
+		$this->deleteFiles = array(
+			'/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default_errors.php',
+		);
+
 		$this->deleteFolders = array(
 			'/administrator/components/com_patchtester/PatchTester/Table',
 			'/components/com_patchtester',

administrator/templates/hathor/html/com_patchtester/pulls/default.php

@@ -13,9 +13,6 @@
 \JHtml::_('stylesheet', 'com_patchtester/octicons.css', array('version' => 'auto', 'relative' => true));
 \JHtml::_('script', 'com_patchtester/patchtester.js', array('version' => 'auto', 'relative' => true));
 
-if (count($this->envErrors)) :
-	echo $this->loadTemplate('errors');
-else :
 $listOrder     = $this->escape($this->state->get('list.ordering'));
 $listDirn      = $this->escape($this->state->get('list.direction'));
 $filterApplied = $this->escape($this->state->get('filter.applied'));
@@ -114,4 +111,3 @@
 		<?php echo \JHtml::_('form.token'); ?>
 	</div>
 </form>
-<?php endif;