dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[+] BO : Helper Tree js improvement

Browse Source
This commit is contained in:
Jerome Nadaud
2013-09-09 18:57:42 +02:00
parent b6e0583af8
commit 4e8658f1d6
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/helper/HelperTree.php
+8 -3
View File
@@ -247,8 +247,13 @@ class HelperTreeCore
if (!file_exists(_PS_BO_ALL_THEMES_DIR_.$bo_theme.DIRECTORY_SEPARATOR if (!file_exists(_PS_BO_ALL_THEMES_DIR_.$bo_theme.DIRECTORY_SEPARATOR
.'template')) .'template'))
$bo_theme = 'default'; $bo_theme = 'default';
$this->getContext()->controller->addJs(__PS_BASE_URI__.$admin_webpath
.'/themes/'.$bo_theme.'/js/tree.js'); if ($this->getContext()->controller->ajax)
$html = '<script type="text/javascript" src="'.__PS_BASE_URI__.$admin_webpath
.'/themes/'.$bo_theme.'/js/tree.js"></script>';
else
$this->getContext()->controller->addJs(__PS_BASE_URI__.$admin_webpath
.'/themes/'.$bo_theme.'/js/tree.js');
//Create Tree Template //Create Tree Template
$template = $this->getContext()->smarty->createTemplate( $template = $this->getContext()->smarty->createTemplate(
@@ -276,7 +281,7 @@ class HelperTreeCore
'nodes' => $this->renderNodes($data) 'nodes' => $this->renderNodes($data)
)); ));
return $template->fetch(); return (isset($html)?$html:'').$template->fetch();
} }
public function renderNodes($data = null) public function renderNodes($data = null)
classes/helper/HelperTreeToolbarSearch.php
+9 -9
View File
@@ -29,10 +29,8 @@ class HelperTreeToolbarSearchCore extends HelperTreeToolbarButtonCore implements
{ {
protected $_template = 'tree_toolbar_search.tpl'; protected $_template = 'tree_toolbar_search.tpl';
public function __construct($label, $action = null, $class = null) public function render()
{ {
parent::__construct($label, $action, $class);
$admin_webpath = str_ireplace(_PS_ROOT_DIR_, '', _PS_ADMIN_DIR_); $admin_webpath = str_ireplace(_PS_ROOT_DIR_, '', _PS_ADMIN_DIR_);
$admin_webpath = preg_replace('/^'.preg_quote(DIRECTORY_SEPARATOR, '/').'/', '', $admin_webpath); $admin_webpath = preg_replace('/^'.preg_quote(DIRECTORY_SEPARATOR, '/').'/', '', $admin_webpath);
$bo_theme = ((Validate::isLoadedObject($this->getContext()->employee) $bo_theme = ((Validate::isLoadedObject($this->getContext()->employee)
@@ -41,18 +39,20 @@ class HelperTreeToolbarSearchCore extends HelperTreeToolbarButtonCore implements
if (!file_exists(_PS_BO_ALL_THEMES_DIR_.$bo_theme.DIRECTORY_SEPARATOR if (!file_exists(_PS_BO_ALL_THEMES_DIR_.$bo_theme.DIRECTORY_SEPARATOR
.'template')) .'template'))
$bo_theme = 'default'; $bo_theme = 'default';
$this->getContext()->controller->addJs(__PS_BASE_URI__.$admin_webpath
.'/themes/'.$bo_theme.'/js/vendor/typeahead.min.js');
}
public function render() if ($this->getContext()->controller->ajax)
{ $html = '<script type="text/javascript" src="'.__PS_BASE_URI__.$admin_webpath
.'/themes/'.$bo_theme.'/js/vendor/typeahead.min.js"></script>';
else
$this->getContext()->controller->addJs(__PS_BASE_URI__.$admin_webpath
.'/themes/'.$bo_theme.'/js/vendor/typeahead.min.js');
$template = parent::render(); $template = parent::render();
$template->assign(array( $template->assign(array(
'action' => $this->getAction(), 'action' => $this->getAction(),
'label' => $this->getLabel(), 'label' => $this->getLabel(),
'class' => $this->getClass() 'class' => $this->getClass()
)); ));
return $template->fetch(); return (isset($html)?$html:'').$template->fetch();
} }
} }