From c0f764edb1b830ef12037688e900b80366c7e4ea Mon Sep 17 00:00:00 2001 From: Hugh Messenger Date: Fri, 23 Feb 2018 06:49:50 -0600 Subject: [PATCH] Fix for override path precedence in fullcalendar viz --- .../fullcalendar/views/fullcalendar/view.html.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/plugins/fabrik_visualization/fullcalendar/views/fullcalendar/view.html.php b/plugins/fabrik_visualization/fullcalendar/views/fullcalendar/view.html.php index 03daba7c377..220e5fb288d 100644 --- a/plugins/fabrik_visualization/fullcalendar/views/fullcalendar/view.html.php +++ b/plugins/fabrik_visualization/fullcalendar/views/fullcalendar/view.html.php @@ -75,10 +75,15 @@ public function display($tpl = 'default') $tmplPath = JPATH_ROOT . '/plugins/fabrik_visualization/fullcalendar/views/fullcalendar/tmpl/' . $tpl; $this->_setPath('template', $tmplPath); - // Store the file in the tmp folder so it can be attached + // @TODO create a viz model getLayout() that sets this path precedence $layout = FabrikHelperHTML::getLayout( 'fabrik-visualization-fullcalendar-event-modal-popup', - array(JPATH_ROOT . '/plugins/fabrik_visualization/fullcalendar/layouts') + array( + JPATH_ROOT . '/plugins/fabrik_visualization/fullcalendar/layouts', + $tmplPath . '/layouts', + JPATH_THEMES . '/' . JFactory::getApplication()->getTemplate() . '/html/layouts/com_fabrik', + JPATH_THEMES . '/' . JFactory::getApplication()->getTemplate() . '/html/layouts/com_fabrik/visualization' + ) ); $displayData = new stdClass; $displayData->id = 'fabrikEvent_modal';