// Remove $this->table and $this->identifier from objectModels + normalize

This commit is contained in:
rMalie
2011-12-09 14:05:24 +00:00
parent 540858527b
commit a284e2ef8b
20 changed files with 124 additions and 115 deletions
+8 -3
View File
@@ -43,7 +43,12 @@ class TranslatedConfigurationCore extends Configuration
// Otherwise configuration is not set as translated configuration.
if ($id !== null)
{
$id_translated = Db::getInstance()->executeS('SELECT `'.$this->identifier.'` FROM `'.pSQL(_DB_PREFIX_.$this->table).'_lang` WHERE `'.$this->identifier.'`='.pSQL($id).' LIMIT 0,1');
$id_translated = Db::getInstance()->executeS('
SELECT `'.$this->def['primary'].'`
FROM `'.pSQL(_DB_PREFIX_.$this->def['table']).'_lang`
WHERE `'.$this->def['primary'].'`='.pSQL($id).' LIMIT 0,1
');
if (empty($id_translated))
$id = null;
}
@@ -81,11 +86,11 @@ class TranslatedConfigurationCore extends Configuration
public function getWebserviceObjectList($sql_join, $sql_filter, $sql_sort, $sql_limit)
{
$query = '
SELECT DISTINCT main.`'.$this->identifier.'` FROM `'._DB_PREFIX_.$this->table.'` main
SELECT DISTINCT main.`'.$this->def['primary'].'` FROM `'._DB_PREFIX_.$this->def['table'].'` main
'.$sql_join.'
WHERE id_configuration IN
( SELECT id_configuration
FROM '._DB_PREFIX_.$this->table.'_lang
FROM '._DB_PREFIX_.$this->def['table'].'_lang
) '.$sql_filter.'
'.($sql_sort != '' ? $sql_sort : '').'
'.($sql_limit != '' ? $sql_limit : '').'