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

[-] BO : fix #PSCFV-4988

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17858 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lLefevre
2012-10-15 09:36:01 +00:00
parent 531877ef71
commit 97a50f54a2
3 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Feature.php
+23 -12
View File
@@ -203,19 +203,30 @@ class FeatureCore extends ObjectModel
WHERE `name` = \''.pSQL($name).'\'
GROUP BY `id_feature`
');
if (!empty($rq))
return (int)$rq['id_feature'];
// Feature doesn't exist, create it
$feature = new Feature();
$languages = Language::getLanguages();
foreach ($languages as $language)
$feature->name[$language['id_lang']] = strval($name);
if ($position)
$feature->position = (int)$position;
if (empty($rq))
{
// Feature doesn't exist, create it
$feature = new Feature();
$languages = Language::getLanguages();
foreach ($languages as $language)
$feature->name[$language['id_lang']] = strval($name);
if ($position)
$feature->position = (int)$position;
else
$feature->position = Feature::getHigherPosition() + 1;
$feature->add();
return $feature->id;
}
else
$feature->position = Feature::getHigherPosition() + 1;
$feature->add();
return $feature->id;
{
if ($position && $feature = new Feature((int)$rq['id_feature']))
{
$feature->position = (int)$position;
$feature->update();
}
return (int)$rq['id_feature'];
}
}
public static function getFeaturesForComparison($list_ids_product, $id_lang)
classes/FeatureValue.php
-1
View File
@@ -138,7 +138,6 @@ class FeatureValueCore extends ObjectModel
ON (fvl.`id_feature_value` = fv.`id_feature_value`)
WHERE `value` = \''.pSQL($name).'\'
AND fv.`id_feature` = '.(int)$id_feature.'
AND fv.`custom` = 1
GROUP BY fv.`id_feature_value` LIMIT 1
');
controllers/admin/AdminImportController.php
+1 -1
View File
@@ -1437,7 +1437,7 @@ class AdminImportControllerCore extends AdminController
$tab_feature = explode(':', $single_feature);
$feature_name = trim($tab_feature[0]);
$feature_value = trim($tab_feature[1]);
$position = isset($tab_feature[2]) ? $tab_feature[1]: false;
$position = isset($tab_feature[2]) ? $tab_feature[2]: false;
$id_feature = Feature::addFeatureImport($feature_name, $position);
$id_feature_value = FeatureValue::addFeatureValueImport($id_feature, $feature_value);
Product::addFeatureProductImport($product->id, $id_feature, $id_feature_value);