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

// Fix bug with js inclusion

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15394 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2012-05-18 15:25:33 +00:00
parent 76b9e4ec08
commit 2fd7807ae5
3 changed files with 47 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/controller/Controller.php
+5 -3
View File
@@ -150,6 +150,10 @@ abstract class ControllerCore
$this->init();
if ($this->checkAccess())
{
// setMedia MUST be called before postProcess
if (!$this->content_only && ($this->display_header || (isset($this->className) && $this->className)))
$this->setMedia();
// postProcess handles ajaxProcess
$this->postProcess();
@@ -157,10 +161,7 @@ abstract class ControllerCore
$this->redirect();
if (!$this->content_only && ($this->display_header || (isset($this->className) && $this->className)))
{
$this->setMedia();
$this->initHeader();
}
if ($this->viewAccess())
$this->initContent();
@@ -266,6 +267,7 @@ abstract class ControllerCore
*/
public function addJS($js_uri)
{
//elog($js_uri);
if (is_array($js_uri))
foreach ($js_uri as $js_file)
{
controllers/admin/AdminModulesController.php
+1 -1
View File
@@ -618,7 +618,7 @@ class AdminModulesControllerCore extends AdminController
public function postProcessCallback()
{
$return = false;
$return = false;
$installed_modules = array();
foreach ($this->map as $key => $method)
controllers/admin/AdminProductsController.php
+41 -45
View File
@@ -1069,6 +1069,47 @@ class AdminProductsControllerCore extends AdminController
{
if (!$this->redirect_after)
parent::postProcess();
if ($this->display == 'edit' || $this->display == 'add')
{
$this->addjQueryPlugin(array(
'autocomplete',
'tablednd',
'thickbox',
'ajaxfileupload',
'date'
));
$this->addJqueryUI(array(
'ui.core',
'ui.widget',
'ui.accordion',
'ui.slider',
'ui.datepicker'
));
$this->addJS(array(
_PS_JS_DIR_.'productTabsManager.js',
_PS_JS_DIR_.'admin-products.js',
_PS_JS_DIR_.'attributesBack.js',
_PS_JS_DIR_.'price.js',
_PS_JS_DIR_.'tiny_mce/tiny_mce.js',
_PS_JS_DIR_.'tinymce.inc.js',
_PS_JS_DIR_.'fileuploader.js',
_PS_JS_DIR_.'admin-dnd.js',
_PS_JS_DIR_.'jquery/plugins/treeview-categories/jquery.treeview-categories.js',
_PS_JS_DIR_.'jquery/plugins/treeview-categories/jquery.treeview-categories.async.js',
_PS_JS_DIR_.'jquery/plugins/treeview-categories/jquery.treeview-categories.edit.js',
_PS_JS_DIR_.'admin-categories-tree.js',
_PS_JS_DIR_.'jquery/ui/jquery.ui.progressbar.min.js',
_PS_JS_DIR_.'jquery/plugins/timepicker/jquery-ui-timepicker-addon.js'
));
$this->addCSS(array(
_PS_JS_DIR_.'jquery/plugins/treeview-categories/jquery.treeview-categories.css',
_PS_JS_DIR_.'jquery/plugins/timepicker/jquery-ui-timepicker-addon.css',
));
}
}
/* @todo rename to processaddproductimage */
@@ -3890,51 +3931,6 @@ class AdminProductsControllerCore extends AdminController
return $trad[$key];
}
public function setMedia()
{
parent::setMedia();
if ($this->display == 'edit' || $this->display == 'add')
{
$this->addjQueryPlugin(array(
'autocomplete',
'tablednd',
'thickbox',
'ajaxfileupload',
'date'
));
$this->addJqueryUI(array(
'ui.core',
'ui.widget',
'ui.accordion',
'ui.slider',
'ui.datepicker'
));
$this->addJS(array(
_PS_JS_DIR_.'productTabsManager.js',
_PS_JS_DIR_.'admin-products.js',
_PS_JS_DIR_.'attributesBack.js',
_PS_JS_DIR_.'price.js',
_PS_JS_DIR_.'tiny_mce/tiny_mce.js',
_PS_JS_DIR_.'tinymce.inc.js',
_PS_JS_DIR_.'fileuploader.js',
_PS_JS_DIR_.'admin-dnd.js',
_PS_JS_DIR_.'jquery/plugins/treeview-categories/jquery.treeview-categories.js',
_PS_JS_DIR_.'jquery/plugins/treeview-categories/jquery.treeview-categories.async.js',
_PS_JS_DIR_.'jquery/plugins/treeview-categories/jquery.treeview-categories.edit.js',
_PS_JS_DIR_.'admin-categories-tree.js',
_PS_JS_DIR_.'jquery/ui/jquery.ui.progressbar.min.js',
_PS_JS_DIR_.'jquery/plugins/timepicker/jquery-ui-timepicker-addon.js'
));
$this->addCSS(array(
_PS_JS_DIR_.'jquery/plugins/treeview-categories/jquery.treeview-categories.css',
_PS_JS_DIR_.'jquery/plugins/timepicker/jquery-ui-timepicker-addon.css',
));
}
}
protected function _displayUnavailableProductWarning()
{
$content = '<div class="warn">