diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index 1cb676e22..e15777173 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -654,7 +654,7 @@ class AdminControllerCore extends Controller 'export_content' => $content ) ); - + $this->layout = 'layout-export.tpl'; } @@ -2112,6 +2112,7 @@ class AdminControllerCore extends Controller */ public function getList($id_lang, $order_by = null, $order_way = null, $start = 0, $limit = null, $id_lang_shop = false) { + if (!isset($this->list_id)) $this->list_id = $this->table; @@ -2166,6 +2167,9 @@ class AdminControllerCore extends Controller $order_by = $this->fields_list[$order_by]['order_key']; /* Determine offset from current page */ + if (isset($this->context->cookie->{$this->list_id.'_page'})) + $start = $this->context->cookie->{$this->list_id.'_page'}; + if ((isset($_POST['submitFilter'.$this->list_id]) || isset($_POST['submitFilter'.$this->list_id.'_x']) || isset($_POST['submitFilter'.$this->list_id.'_y'])) && @@ -2173,6 +2177,8 @@ class AdminControllerCore extends Controller is_numeric($_POST['submitFilter'.$this->list_id])) $start = ((int)$_POST['submitFilter'.$this->list_id] - 1) * $limit; + $this->context->cookie->{$this->list_id.'_page'} = $start; + /* Cache */ $this->_lang = (int)$id_lang; $this->_orderBy = $order_by; @@ -2241,8 +2247,6 @@ class AdminControllerCore extends Controller $having_clause .= $this->_having.' '; } - - $this->_listsql = ' SELECT SQL_CALC_FOUND_ROWS '.($this->_tmpTableFilter ? ' * FROM (SELECT ' : '');