[*] BO : #PSFV-94 - added AdminSuppliersController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9806 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
@@ -962,8 +962,8 @@ class AdminControllerCore extends Controller
|
||||
|
||||
if (trim($tab['module']) != '')
|
||||
$img = _MODULE_DIR_.$tab['module'].'/'.$tab['class_name'].'.png';
|
||||
|
||||
// retrocompatibility
|
||||
|
||||
// retrocompatibility
|
||||
if(!file_exists($img))
|
||||
$img = str_replace('png', 'gif', $img);
|
||||
|
||||
@@ -1091,7 +1091,13 @@ class AdminControllerCore extends Controller
|
||||
return;
|
||||
$this->content .= $this->initForm();
|
||||
}
|
||||
elseif ($this->display != 'view' && !$this->ajax)
|
||||
elseif ($this->display == 'view')
|
||||
{
|
||||
if (!($this->object = $this->loadObject(true)))
|
||||
return;
|
||||
$this->content .= $this->initView();
|
||||
}
|
||||
elseif (!$this->ajax)
|
||||
{
|
||||
$this->content .= $this->initList();
|
||||
$this->content .= $this->initOptions();
|
||||
@@ -1169,10 +1175,17 @@ class AdminControllerCore extends Controller
|
||||
return $helper->generateList($this->_list, $this->fieldsDisplay);
|
||||
}
|
||||
|
||||
/**
|
||||
* Override to init display of the view page
|
||||
*/
|
||||
public function initView()
|
||||
{
|
||||
}
|
||||
|
||||
/**
|
||||
* this function set various display option for helper list
|
||||
*
|
||||
* @param Helper $helper
|
||||
*
|
||||
* @param Helper $helper
|
||||
* @return void
|
||||
*/
|
||||
public function setHelperListDisplay(Helper $helper)
|
||||
|
||||
@@ -31,6 +31,7 @@ class HelperFormCore extends Helper
|
||||
public $id;
|
||||
|
||||
public $first_call = true;
|
||||
public $toolbar = true;
|
||||
|
||||
/**
|
||||
* @var array of forms fields
|
||||
@@ -98,7 +99,8 @@ class HelperFormCore extends Helper
|
||||
'asso_shop' => (isset($this->fields_form['asso_shop']) && $this->fields_form['asso_shop']) ? $this->displayAssoShop() : null,
|
||||
'iso' => file_exists(_PS_ROOT_DIR_.'/js/tiny_mce/langs/'.$iso.'.js') ? $iso : 'en',
|
||||
'path_css' => _THEME_CSS_DIR_,
|
||||
'ad' => dirname($_SERVER["PHP_SELF"])
|
||||
'ad' => dirname($_SERVER["PHP_SELF"]),
|
||||
'toolbar' => $this->toolbar
|
||||
));
|
||||
|
||||
return $this->context->smarty->fetch(_PS_ADMIN_DIR_.'/themes/template/'.$this->tpl);
|
||||
|
||||
@@ -62,6 +62,8 @@ class HelperListCore extends Helper
|
||||
|
||||
protected $is_dnd_identifier = false;
|
||||
|
||||
public $toolbar = true;
|
||||
|
||||
/* Customize list display
|
||||
*
|
||||
* align : determine value alignment
|
||||
@@ -538,6 +540,7 @@ class HelperListCore extends Helper
|
||||
'table_dnd' => isset($table_dnd) ? $table_dnd : null,
|
||||
'name' => isset($name) ? $name : null,
|
||||
'name_id' => isset($name_id) ? $name_id : null,
|
||||
'toolbar' => $this->toolbar
|
||||
));
|
||||
|
||||
return $this->context->smarty->fetch(_PS_ADMIN_DIR_.'/themes/template/'.$this->header_tpl);
|
||||
|
||||
Reference in New Issue
Block a user