// fix Update the call of JavaScript and CSS files in the class of HelperForm and controller templates (PSFV-94)

This commit is contained in:
lLefevre
2011-11-14 14:21:26 +00:00
parent 74ef17ca79
commit 5bde977d1f
7 changed files with 87 additions and 47 deletions
@@ -294,13 +294,6 @@ class AdminCategoriesControllerCore extends AdminController
'size' => $image ? filesize(_PS_CAT_IMG_DIR_.'/'.$obj->id.'.jpg') / 1000 : false
);
$iso = $this->context->language->iso_code;
$this->context->smarty->assign(array(
'iso' => file_exists(_PS_ROOT_DIR_.'/js/tiny_mce/langs/'.$iso.'.js') ? $iso : 'en',
'theme_path_css' => _THEME_CSS_DIR_,
'ad' => dirname($_SERVER["PHP_SELF"])
));
// Added values of object Group
$carrier_groups = $obj->getGroups();
$carrier_groups_ids = array();
@@ -393,6 +393,8 @@ class AdminImportController extends AdminController
)
);
$this->addJS(_PS_JS_DIR_.'adminImport.js');
$glue = Tools::getValue('separator', ';');
$handle = $this->openCsvFile();
$nb_column = $this->getNbrColumn($handle, $glue);