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

// Fix features list filters and sort

Browse Source
This commit is contained in:
Jerome Nadaud
2013-10-01 18:10:52 +02:00
parent f2849bdb70
commit dd60eb66cf
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminFeaturesController.php
+22 -7
View File
@@ -33,6 +33,7 @@ class AdminFeaturesControllerCore extends AdminController
{ {
$this->table = 'feature'; $this->table = 'feature';
$this->className = 'Feature'; $this->className = 'Feature';
$this->list_id = 'feature';
$this->lang = true; $this->lang = true;
$this->fields_list = array( $this->fields_list = array(
@@ -121,8 +122,8 @@ class AdminFeaturesControllerCore extends AdminController
{ {
if (($id = Tools::getValue('id_feature'))) if (($id = Tools::getValue('id_feature')))
{ {
$this->setTypeValue(); $this->setTypeValue();
$this->list_id = 'feature_value';
$this->lang = true; $this->lang = true;
// Action for list // Action for list
@@ -149,16 +150,17 @@ class AdminFeaturesControllerCore extends AdminController
); );
$this->_where = sprintf('AND `id_feature` = %d', (int)$id); $this->_where = sprintf('AND `id_feature` = %d', (int)$id);
self::$currentIndex = self::$currentIndex.'&id_feature='.(int)$id.'&viewfeature';
$this->processFilter();
return parent::renderList();
} }
return parent::renderList();
} }
/** /**
* method call when ajax request is made with the details row action * method call when ajax request is made with the details row action
* @see AdminController::postProcess() * @see AdminController::postProcess()
*/ */
public function ajaxProcessDetails() /*public function ajaxProcessDetails()
{ {
if (($id = Tools::getValue('id'))) if (($id = Tools::getValue('id')))
{ {
@@ -210,7 +212,7 @@ class AdminFeaturesControllerCore extends AdminController
echo Tools::jsonEncode(array('use_parent_structure' => false, 'data' => $content)); echo Tools::jsonEncode(array('use_parent_structure' => false, 'data' => $content));
exit; exit;
} }
} }*/
/** /**
* AdminController::renderForm() override * AdminController::renderForm() override
@@ -260,7 +262,7 @@ class AdminFeaturesControllerCore extends AdminController
{ {
$this->page_header_toolbar_title = $this->feature_name[$this->context->employee->id_lang]; $this->page_header_toolbar_title = $this->feature_name[$this->context->employee->id_lang];
$this->page_header_toolbar_btn['back_to_list'] = array( $this->page_header_toolbar_btn['back_to_list'] = array(
'href' => self::$currentIndex.'&token='.$this->token, 'href' => Context::getContext()->link->getAdminLink('AdminFeatures'),
'desc' => $this->l('Back to list'), 'desc' => $this->l('Back to list'),
'icon' => 'process-icon-back' 'icon' => 'process-icon-back'
); );
@@ -318,7 +320,10 @@ class AdminFeaturesControllerCore extends AdminController
); );
break; break;
case 'view': case 'view':
break; $this->toolbar_btn['back'] = array(
'href' => self::$currentIndex.'&token='.$this->token,
'desc' => $this->l('Back to the list')
);
default: default:
parent::initToolbar(); parent::initToolbar();
@@ -449,6 +454,16 @@ class AdminFeaturesControllerCore extends AdminController
|| Tools::isSubmit('submitBulkdeletefeature_value')) || Tools::isSubmit('submitBulkdeletefeature_value'))
$this->setTypeValue(); $this->setTypeValue();
if (Tools::getIsset('viewfeature'))
{
$this->list_id = 'feature_value';
if (isset($_POST['submitReset'.$this->list_id]))
$this->processResetFilters();
}
else
$this->list_id = 'feature';
parent::initProcess(); parent::initProcess();
} }