diff --git a/modules/Calendar/models/ListView.php b/modules/Calendar/models/ListView.php index a40705d68501e2518d196e7264f5424b13e21ded..216dda81a51e94eb759d81e154b3cecbc2a1a931 100644 --- a/modules/Calendar/models/ListView.php +++ b/modules/Calendar/models/ListView.php @@ -203,8 +203,8 @@ class Calendar_ListView_Model extends Vtiger_ListView_Model { $queryGenerator->addUserSearchConditions(array('search_field' => $searchKey, 'search_text' => $searchValue, 'operator' => $operator)); } - $orderBy = $this->get('orderby'); - $sortOrder = $this->get('sortorder'); + $orderBy = $this->getForSql('orderby'); + $sortOrder = $this->getForSql('sortorder'); if(empty($sortOrder)) { $sortOrder = 'DESC'; } diff --git a/modules/Documents/models/ListView.php b/modules/Documents/models/ListView.php index 0e62f6f521218f26fa4647b4193f521087538cd4..12f2120f25dd48e1419754aea330a052597ffd4d 100644 --- a/modules/Documents/models/ListView.php +++ b/modules/Documents/models/ListView.php @@ -173,8 +173,8 @@ class Documents_ListView_Model extends Vtiger_ListView_Model { $queryGenerator->addUserSearchConditions(array('search_field' => $searchKey, 'search_text' => $searchValue, 'operator' => $operator)); } - $orderBy = $this->get('orderby'); - $sortOrder = $this->get('sortorder'); + $orderBy = $this->getForSql('orderby'); + $sortOrder = $this->getForSql('sortorder'); if(!empty($orderBy)){ $queryGenerator = $this->get('query_generator'); diff --git a/modules/PriceBooks/models/ListView.php b/modules/PriceBooks/models/ListView.php index f34855d36b0d3d6c4a3b2d2cf78ca1132bf6a44f..c73bd68e7d1e9939cd900c7f534f4c71dd8da7ea 100644 --- a/modules/PriceBooks/models/ListView.php +++ b/modules/PriceBooks/models/ListView.php @@ -73,8 +73,8 @@ class PriceBooks_ListView_Model extends Vtiger_ListView_Model { $queryGenerator->addUserSearchConditions(array('search_field' => $searchKey, 'search_text' => $searchValue, 'operator' => $operator)); } - $orderBy = $this->get('orderby'); - $sortOrder = $this->get('sortorder'); + $orderBy = $this->getForSql('orderby'); + $sortOrder = $this->getForSql('sortorder'); if(!empty($orderBy)){ $queryGenerator = $this->get('query_generator'); diff --git a/modules/Products/models/ListView.php b/modules/Products/models/ListView.php index 7aa64ad15417fc3171199cd62b0f4604715a0f29..00a0e74b867ddf5ec037350832c1f49eb8e37cb9 100644 --- a/modules/Products/models/ListView.php +++ b/modules/Products/models/ListView.php @@ -43,8 +43,8 @@ class Products_ListView_Model extends Vtiger_ListView_Model { $queryGenerator->addUserSearchConditions(array('search_field' => $searchKey, 'search_text' => $searchValue, 'operator' => $operator)); } - $orderBy = $this->get('orderby'); - $sortOrder = $this->get('sortorder'); + $orderBy = $this->getForSql('orderby'); + $sortOrder = $this->getForSql('sortorder'); if(!empty($orderBy)){ $queryGenerator = $this->get('query_generator'); diff --git a/modules/Reports/models/ListView.php b/modules/Reports/models/ListView.php index 9e3e5a7c039c69d557c55f5f194181f5f25ebcb5..90fafd3fe6bf9634e1eccf8518a9f084eddde0ed 100644 --- a/modules/Reports/models/ListView.php +++ b/modules/Reports/models/ListView.php @@ -95,7 +95,7 @@ class Reports_ListView_Model extends Vtiger_ListView_Model { $reportFolderModel = Reports_Folder_Model::getInstance(); $reportFolderModel->set('folderid', $this->get('folderid')); - $orderBy = $this->get('orderby'); + $orderBy = $this->getForSql('orderby'); if (!empty($orderBy) && $orderBy === 'smownerid') { $fieldModel = Vtiger_Field_Model::getInstance('assigned_user_id', $moduleModel); if ($fieldModel->getFieldDataType() == 'owner') { @@ -104,7 +104,7 @@ class Reports_ListView_Model extends Vtiger_ListView_Model { } if(!empty($orderBy)) { $reportFolderModel->set('orderby', $orderBy); - $reportFolderModel->set('sortby', $this->get('sortorder')); + $reportFolderModel->set('sortby', $this->getForSql('sortorder')); } $reportFolderModel->set('search_params', $this->get('search_params')); diff --git a/modules/Vtiger/models/ListView.php b/modules/Vtiger/models/ListView.php index f218a9e9474cff67a9363c929b3f93cc5cf5aae8..420319a7abb9a256eefae67abfbcd20efb9fd0fb 100644 --- a/modules/Vtiger/models/ListView.php +++ b/modules/Vtiger/models/ListView.php @@ -206,8 +206,8 @@ class Vtiger_ListView_Model extends Vtiger_Base_Model { $queryGenerator->addUserSearchConditions(array('search_field' => $searchKey, 'search_text' => $searchValue, 'operator' => $operator)); } - $orderBy = $this->get('orderby'); - $sortOrder = $this->get('sortorder'); + $orderBy = $this->getForSql('orderby'); + $sortOrder = $this->getForSql('sortorder'); if(!empty($orderBy)){ $queryGenerator = $this->get('query_generator'); @@ -238,8 +238,7 @@ class Vtiger_ListView_Model extends Vtiger_Base_Model { if($orderBy == 'roleid' && $moduleName == 'Users'){ $listQuery .= ' ORDER BY vtiger_role.rolename '.' '. $sortOrder; } else { - $listQuery .= ' ORDER BY ? '.$sortOrder; - array_push($paramArray, $queryGenerator->getOrderByColumn($orderBy)); + $listQuery .= ' ORDER BY '.$queryGenerator->getOrderByColumn($orderBy).' '.$sortOrder; } if ($orderBy == 'first_name' && $moduleName == 'Users') { diff --git a/pkg/vtiger/modules/Import/modules/Import/models/ListView.php b/pkg/vtiger/modules/Import/modules/Import/models/ListView.php index 9e6714f03eefcc93eb989867ac0d575b47850f45..ab2d5c8d0c8621474e708e528754ab97a6f56734 100644 --- a/pkg/vtiger/modules/Import/modules/Import/models/ListView.php +++ b/pkg/vtiger/modules/Import/modules/Import/models/ListView.php @@ -62,8 +62,8 @@ class Import_ListView_Model extends Vtiger_ListView_Model { $queryGenerator->addUserSearchConditions(array('search_field' => $searchKey, 'search_text' => $searchValue, 'operator' => 'c')); } - $orderBy = $this->get('orderby'); - $sortOrder = $this->get('sortorder'); + $orderBy = $this->getForSql('orderby'); + $sortOrder = $this->getForSql('sortorder'); if(!empty($orderBy)) { $queryGenerator = $this->get('query_generator'); $fieldModels = $queryGenerator->getModuleFields();