mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-20 00:12:15 +00:00
- Added new JS public/js/RESTClient.js as axios wrapper
- composer.json: added axios from github - Added new directory application/components/extensions/ - Added new utility function findResource to application/helpers/hlp_common_helper.php - Now the library libraries/FilterCmptLib loads the component definition php files from the extensions - views/system/logs/logsViewer now includes axios and restclient, removed the includes for ajaxlib and jQueryUI - Added includes for the RESTClient and axios to views/templates/FHC-Common and views/templates/FHC-Footer - Improved component js/components/Fetch - Components public/js/components/Filter.js and public/js/components/Navigation.js now they are making use of the Fetch component or/and the RESTClient
This commit is contained in:
@@ -117,11 +117,25 @@ class FilterCmptLib
|
||||
//
|
||||
if (!$this->_checkJSParameters()) return;
|
||||
|
||||
// Gets the filter configuration from the file system
|
||||
require_once(APPPATH.'components/filters/'.$this->_filterType.'.php');
|
||||
//
|
||||
$filePath = findResource(APPPATH.'components/filters/', $this->_filterType, true);
|
||||
if (!isEmptyString($filePath))
|
||||
{
|
||||
// Gets the filter configuration from the file system
|
||||
require_once($filePath);
|
||||
}
|
||||
else
|
||||
{
|
||||
$filePath = findResource(APPPATH.'components/extensions/', $this->_filterType, true);
|
||||
if (!isEmptyString($filePath)) require_once($filePath);
|
||||
}
|
||||
|
||||
// Gets the filter configuration from the extensions
|
||||
// require_once(APPPATH.'components/extensions/'.$this->_filterType.'.php');
|
||||
//
|
||||
if (!isset($filterCmptArray))
|
||||
{
|
||||
$this->_setSession(error('Component definition file '.$this->_filterType.' not found'));
|
||||
return;
|
||||
}
|
||||
|
||||
//
|
||||
if (!$this->_checkPHPParameters($filterCmptArray)) return;
|
||||
|
||||
Reference in New Issue
Block a user