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

// Fixed #PSFV-583 & #PSFV-584

Browse Source
This commit is contained in:
bMancone
2012-03-02 09:56:24 +00:00
parent 0f646343af
commit 63841a6a03
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminImportController.php
+8 -1
View File
@@ -1018,6 +1018,8 @@ class AdminImportControllerCore extends AdminController
$category_to_create->name = AdminImportController::createMultiLangField($value); $category_to_create->name = AdminImportController::createMultiLangField($value);
$category_to_create->active = 1; $category_to_create->active = 1;
$category_to_create->id_parent = Configuration::get('PS_HOME_CATEGORY'); // Default parent is home for unknown category to create $category_to_create->id_parent = Configuration::get('PS_HOME_CATEGORY'); // Default parent is home for unknown category to create
$category_link_rewrite = Tools::link_rewrite($category_to_create->name[$default_language_id]);
$category_to_create->link_rewrite = AdminImportController::createMultiLangField($category_link_rewrite);
if (($field_error = $category_to_create->validateFields(UNFRIENDLY_ERROR, true)) === true && if (($field_error = $category_to_create->validateFields(UNFRIENDLY_ERROR, true)) === true &&
($lang_field_error = $category_to_create->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true && $category_to_create->add()) ($lang_field_error = $category_to_create->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true && $category_to_create->add())
$product->id_category[] = (int)$category_to_create->id; $product->id_category[] = (int)$category_to_create->id;
@@ -1041,6 +1043,8 @@ class AdminImportControllerCore extends AdminController
$category_to_create->name = AdminImportController::createMultiLangField($value); $category_to_create->name = AdminImportController::createMultiLangField($value);
$category_to_create->active = 1; $category_to_create->active = 1;
$category_to_create->id_parent = (int)Configuration::get('PS_HOME_CATEGORY'); // Default parent is home for unknown category to create $category_to_create->id_parent = (int)Configuration::get('PS_HOME_CATEGORY'); // Default parent is home for unknown category to create
$category_link_rewrite = Tools::link_rewrite($category_to_create->name[$default_language_id]);
$category_to_create->link_rewrite = AdminImportController::createMultiLangField($category_link_rewrite);
if (($field_error = $category_to_create->validateFields(UNFRIENDLY_ERROR, true)) === true && if (($field_error = $category_to_create->validateFields(UNFRIENDLY_ERROR, true)) === true &&
($lang_field_error = $category_to_create->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true && $category_to_create->add()) ($lang_field_error = $category_to_create->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true && $category_to_create->add())
$product->id_category[] = (int)$category_to_create->id; $product->id_category[] = (int)$category_to_create->id;
@@ -1068,6 +1072,7 @@ class AdminImportControllerCore extends AdminController
if ($link_rewrite == '') if ($link_rewrite == '')
$link_rewrite = 'friendly-url-autogeneration-failed'; $link_rewrite = 'friendly-url-autogeneration-failed';
} }
if (!$valid_link) if (!$valid_link)
$this->warnings[] = Tools::displayError('Rewrite link for').' '.$link_rewrite.(isset($info['id']) ? ' (ID '.$info['id'].') ' : ''). $this->warnings[] = Tools::displayError('Rewrite link for').' '.$link_rewrite.(isset($info['id']) ? ' (ID '.$info['id'].') ' : '').
' '.Tools::displayError('was re-written as').' '.$link_rewrite; ' '.Tools::displayError('was re-written as').' '.$link_rewrite;
@@ -1110,6 +1115,7 @@ class AdminImportControllerCore extends AdminController
$res = $product->add(); $res = $product->add();
} }
} }
// If both failed, mysql error // If both failed, mysql error
if (!$res) if (!$res)
{ {
@@ -1231,7 +1237,8 @@ class AdminImportControllerCore extends AdminController
// Features import // Features import
$features = get_object_vars($product); $features = get_object_vars($product);
if (isset($features['features']))
if (isset($features['features']) && !empty($features['features']))
foreach (explode(',', $features['features']) as $single_feature) foreach (explode(',', $features['features']) as $single_feature)
{ {
$tab_feature = explode(':', $single_feature); $tab_feature = explode(':', $single_feature);