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

[-] WS: Fix webservice sort for multishop fields #PSCFV-5634

Browse Source
This commit is contained in:
Rémi Gaillard committed 2013-06-13 12:01:51 +02:00
1 parent 5d6d06f8fb
commit 5bf4c17f4a
2 files changed
+13 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

classes/ObjectModel.php
+5
View File
@@ -1278,6 +1278,11 @@ abstract class ObjectModelCore
return Shop::isTableAssociated($this->def['table']) || !empty($this->def['multilang_shop']); return Shop::isTableAssociated($this->def['table']) || !empty($this->def['multilang_shop']);
} }
public function isMultiShopField($field)
{
return (isset($this->def['fields'][$field]) && isset($this->def['fields'][$field]['shop']) && $this->def['fields'][$field]['shop']);
}
public function isLangMultishop() public function isLangMultishop()
{ {
return !empty($this->def['multilang']) && !empty($this->def['multilang_shop']); return !empty($this->def['multilang']) && !empty($this->def['multilang_shop']);
classes/webservice/WebserviceRequest.php
+8 -1
View File
@@ -1184,7 +1184,14 @@ class WebserviceRequestCore
$sql_sort .= 'main_i18n.`'.pSQL($this->resourceConfiguration['fields'][$fieldName]['sqlId']).'` '.$direction.', ';// ORDER BY main_i18n.`field` ASC|DESC $sql_sort .= 'main_i18n.`'.pSQL($this->resourceConfiguration['fields'][$fieldName]['sqlId']).'` '.$direction.', ';// ORDER BY main_i18n.`field` ASC|DESC
} }
else else
$sql_sort .= (isset($this->resourceConfiguration['retrieveData']['tableAlias']) ? $this->resourceConfiguration['retrieveData']['tableAlias'].'.' : '').'`'.pSQL($this->resourceConfiguration['fields'][$fieldName]['sqlId']).'` '.$direction.', ';// ORDER BY `field` ASC|DESC {
$object = new $this->resourceConfiguration['retrieveData']['className']();
if ($object->isMultiShopField($this->resourceConfiguration['fields'][$fieldName]['sqlId']))
$table_alias = 'multi_shop_'.$this->resourceConfiguration['retrieveData']['table'];
else
$table_alias = '';
$sql_sort .= (isset($this->resourceConfiguration['retrieveData']['tableAlias']) ? '`'.bqSQL($this->resourceConfiguration['retrieveData']['tableAlias']).'`.' : '`'.bqSQL($table_alias).'`.').'`'.pSQL($this->resourceConfiguration['fields'][$fieldName]['sqlId']).'` '.$direction.', ';// ORDER BY `field` ASC|DESC
}
} }
$sql_sort = rtrim($sql_sort, ', ')."\n"; $sql_sort = rtrim($sql_sort, ', ')."\n";
} }