From c108343802885ce1ecbc655a1f818edbe2fec9a2 Mon Sep 17 00:00:00 2001 From: Michael Babker Date: Sat, 9 May 2015 13:18:35 -0400 Subject: [PATCH] Move the line the error check is done on, add error check to Hathor (Fix #32) --- .../com_patchtester/PatchTester/View/Pulls/tmpl/default.php | 6 +++--- .../templates/hathor/html/com_patchtester/pulls/default.php | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default.php b/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default.php index 4d0690c..9d300f9 100644 --- a/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default.php +++ b/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default.php @@ -13,14 +13,14 @@ \JHtml::_('stylesheet', 'com_patchtester/octicons.css', array(), true); +if (count($this->envErrors)) : + $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')); $sortFields = $this->getSortFields(); -if (count($this->envErrors)) : - $this->loadTemplate('errors'); -else : \JFactory::getDocument()->addScriptDeclaration( " var submitpatch = function (task, id) { diff --git a/administrator/templates/hathor/html/com_patchtester/pulls/default.php b/administrator/templates/hathor/html/com_patchtester/pulls/default.php index 097ad07..5d2e4f7 100644 --- a/administrator/templates/hathor/html/com_patchtester/pulls/default.php +++ b/administrator/templates/hathor/html/com_patchtester/pulls/default.php @@ -13,6 +13,9 @@ \JHtml::_('stylesheet', 'com_patchtester/octicons.css', array(), true); +if (count($this->envErrors)) : + $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')); @@ -106,3 +109,4 @@ echo JHtmlBootstrap::renderModal( +