// fix bug in bulk_actions of type "delete" in AdminController's
This commit is contained in:
@@ -53,6 +53,8 @@ class AdminAttributesGroupsControllerCore extends AdminController
|
||||
)
|
||||
);
|
||||
|
||||
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
|
||||
|
||||
parent::__construct();
|
||||
}
|
||||
|
||||
@@ -66,8 +68,6 @@ class AdminAttributesGroupsControllerCore extends AdminController
|
||||
$this->addRowAction('delete');
|
||||
$this->addRowAction('details');
|
||||
|
||||
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
|
||||
|
||||
return parent::renderList();
|
||||
}
|
||||
|
||||
@@ -117,8 +117,6 @@ class AdminAttributesGroupsControllerCore extends AdminController
|
||||
$this->addRowAction('edit');
|
||||
$this->addRowAction('delete');
|
||||
|
||||
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
|
||||
|
||||
// override attributes
|
||||
$this->display = 'list';
|
||||
$this->tpl_folder = 'attributes/';
|
||||
|
||||
@@ -44,6 +44,8 @@ class AdminBackupControllerCore extends AdminController
|
||||
'filesize' => array('title' => $this->l('File size'))
|
||||
);
|
||||
|
||||
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
|
||||
|
||||
$this->options = array(
|
||||
'general' => array(
|
||||
'title' => $this->l('Backup options'),
|
||||
@@ -73,7 +75,6 @@ class AdminBackupControllerCore extends AdminController
|
||||
{
|
||||
$this->addRowAction('view');
|
||||
$this->addRowAction('delete');
|
||||
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
|
||||
|
||||
return parent::renderList();
|
||||
}
|
||||
|
||||
@@ -80,6 +80,8 @@ class AdminCategoriesControllerCore extends AdminController
|
||||
)
|
||||
);
|
||||
|
||||
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
|
||||
|
||||
if ($id_category = Tools::getvalue('id_category'))
|
||||
$this->_category = new Category($id_category);
|
||||
else
|
||||
@@ -102,8 +104,6 @@ class AdminCategoriesControllerCore extends AdminController
|
||||
$this->addRowAction('add');
|
||||
$this->addRowAction('view');
|
||||
|
||||
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
|
||||
|
||||
$this->_filter .= ' AND `id_parent` = '.(int)$this->_category->id.' ';
|
||||
$this->_select = 'position ';
|
||||
|
||||
|
||||
@@ -45,6 +45,8 @@ class AdminCurrenciesControllerCore extends AdminController
|
||||
'active' => array('title' => $this->l('Enabled'), 'width' => 25, 'align' => 'center', 'active' => 'status', 'type' => 'bool', 'orderby' => false),
|
||||
);
|
||||
|
||||
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
|
||||
|
||||
$this->options = array(
|
||||
'general' => array(
|
||||
'title' => $this->l('Currencies options'),
|
||||
@@ -86,7 +88,6 @@ class AdminCurrenciesControllerCore extends AdminController
|
||||
{
|
||||
$this->addRowAction('edit');
|
||||
$this->addRowAction('delete');
|
||||
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
|
||||
|
||||
$this->_where = 'AND a.`deleted` = 0';
|
||||
|
||||
|
||||
@@ -58,6 +58,8 @@ class AdminFeaturesControllerCore extends AdminController
|
||||
)
|
||||
);
|
||||
|
||||
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
|
||||
|
||||
parent::__construct();
|
||||
}
|
||||
|
||||
@@ -71,8 +73,6 @@ class AdminFeaturesControllerCore extends AdminController
|
||||
$this->addRowAction('delete');
|
||||
$this->addRowAction('details');
|
||||
|
||||
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
|
||||
|
||||
// Added specific button in toolbar
|
||||
$this->toolbar_btn['newAttributes'] = array(
|
||||
'href' => self::$currentIndex.'&addfeature_value&token='.$this->token,
|
||||
@@ -108,8 +108,6 @@ class AdminFeaturesControllerCore extends AdminController
|
||||
$this->addRowAction('edit');
|
||||
$this->addRowAction('delete');
|
||||
|
||||
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
|
||||
|
||||
if (!Validate::isLoadedObject($obj = new FeatureValue((int)$id)))
|
||||
$this->_errors[] = Tools::displayError('An error occurred while updating status for object.').' <b>'.$this->table.'</b> '.Tools::displayError('(cannot load object)');
|
||||
|
||||
|
||||
@@ -90,6 +90,9 @@ class AdminLanguagesControllerCore extends AdminController
|
||||
)
|
||||
);
|
||||
|
||||
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
|
||||
$this->specificConfirmDelete = $this->l('When you delete a language, ALL RELATED TRANSLATIONS IN THE DATABASE WILL BE DELETED, are you sure you want to delete this language?', __CLASS__, true, false);
|
||||
|
||||
$this->options = array(
|
||||
'general' => array(
|
||||
'title' => $this->l('Languages options'),
|
||||
@@ -115,9 +118,6 @@ class AdminLanguagesControllerCore extends AdminController
|
||||
$this->addRowAction('edit');
|
||||
$this->addRowAction('delete');
|
||||
|
||||
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
|
||||
$this->specificConfirmDelete = $this->l('When you delete a language, ALL RELATED TRANSLATIONS IN THE DATABASE WILL BE DELETED, are you sure you want to delete this language?', __CLASS__, true, false);
|
||||
|
||||
$this->displayWarning($this->l('When you delete a language, all related translations in the database will be deleted.'));
|
||||
return parent::renderList();
|
||||
}
|
||||
|
||||
@@ -132,8 +132,6 @@ class AdminManufacturersControllerCore extends AdminController
|
||||
$this->addRowAction('editaddresses');
|
||||
$this->addRowAction('delete');
|
||||
|
||||
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
|
||||
|
||||
// test if a filter is applied for this list
|
||||
if (Tools::isSubmit('submitFilter'.$this->table) || $this->context->cookie->{'submitFilter'.$this->table} !== false)
|
||||
$this->filter = true;
|
||||
@@ -660,20 +658,6 @@ class AdminManufacturersControllerCore extends AdminController
|
||||
$this->action = 'save';
|
||||
else if (Tools::isSubmit('deleteaddress'))
|
||||
$this->action = 'delete';
|
||||
else if (is_array($this->bulk_actions))
|
||||
{
|
||||
foreach ($this->bulk_actions as $bulk_action => $params)
|
||||
{
|
||||
if (Tools::isSubmit('submitBulk'.$bulk_action.$this->table))
|
||||
{
|
||||
$this->action = 'bulk'.$bulk_action;
|
||||
$this->boxes = Tools::getValue($this->table.'Box');
|
||||
break;
|
||||
}
|
||||
}
|
||||
if ($this->ajax && method_exists($this, 'ajaxPreprocess'))
|
||||
$this->ajaxPreProcess();
|
||||
}
|
||||
}
|
||||
|
||||
public function postProcess()
|
||||
|
||||
@@ -138,6 +138,8 @@ class AdminReferrersControllerCore extends AdminController
|
||||
)
|
||||
);
|
||||
|
||||
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
|
||||
|
||||
parent::__construct();
|
||||
}
|
||||
|
||||
@@ -148,8 +150,6 @@ class AdminReferrersControllerCore extends AdminController
|
||||
$this->addRowAction('edit');
|
||||
$this->addRowAction('delete');
|
||||
|
||||
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
|
||||
|
||||
$this->_select = 'SUM(sa.cache_visitors) AS cache_visitors, SUM(sa.cache_visits) AS cache_visits, SUM(sa.cache_pages) AS cache_pages,
|
||||
SUM(sa.cache_registrations) AS cache_registrations, SUM(sa.cache_orders) AS cache_orders, SUM(sa.cache_sales) AS cache_sales,
|
||||
IF(sa.cache_orders > 0, ROUND(sa.cache_sales/sa.cache_orders, 2), 0) as cart, (sa.cache_visits*click_fee) as fee0,
|
||||
|
||||
@@ -42,6 +42,7 @@ class AdminRequestSqlControllerCore extends AdminController
|
||||
'name' => array('title' => $this->l('Name'), 'width' => 300),
|
||||
'sql' => array('title' => $this->l('Request'), 'width' => 500)
|
||||
);
|
||||
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'),'confirm' => $this->l('Delete selected items?')));
|
||||
|
||||
parent::__construct();
|
||||
}
|
||||
@@ -64,7 +65,6 @@ class AdminRequestSqlControllerCore extends AdminController
|
||||
$this->addRowAction('view');
|
||||
$this->addRowAction('edit');
|
||||
$this->addRowAction('delete');
|
||||
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'),'confirm' => $this->l('Delete selected items?')));
|
||||
|
||||
return parent::renderList();
|
||||
}
|
||||
|
||||
@@ -64,6 +64,8 @@ class AdminShopControllerCore extends AdminController
|
||||
)
|
||||
);
|
||||
|
||||
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'),'confirm' => $this->l('Delete selected items?')));
|
||||
|
||||
$this->options = array(
|
||||
'general' => array(
|
||||
'title' => $this->l('Shops options'),
|
||||
@@ -102,8 +104,6 @@ class AdminShopControllerCore extends AdminController
|
||||
$this->addRowAction('edit');
|
||||
$this->addRowAction('delete');
|
||||
|
||||
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'),'confirm' => $this->l('Delete selected items?')));
|
||||
|
||||
$this->_select = 'gs.name group_shop_name, cl.name category_name';
|
||||
$this->_join = '
|
||||
LEFT JOIN `'._DB_PREFIX_.'group_shop` gs
|
||||
|
||||
@@ -83,13 +83,13 @@ class AdminShopUrlControllerCore extends AdminController
|
||||
'width' => 50,
|
||||
),
|
||||
);
|
||||
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
|
||||
|
||||
parent::__construct();
|
||||
}
|
||||
|
||||
public function renderList()
|
||||
{
|
||||
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
|
||||
$this->addRowActionSkipList('delete', array(1));
|
||||
|
||||
$this->addRowAction('edit');
|
||||
|
||||
@@ -50,6 +50,7 @@ class AdminSlipControllerCore extends AdminController
|
||||
'align' => 'right'
|
||||
)
|
||||
);
|
||||
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
|
||||
|
||||
$this->optionTitle = $this->l('Slip');
|
||||
|
||||
@@ -60,7 +61,6 @@ class AdminSlipControllerCore extends AdminController
|
||||
{
|
||||
$this->addRowAction('edit');
|
||||
$this->addRowAction('delete');
|
||||
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
|
||||
|
||||
return parent::renderList();
|
||||
}
|
||||
|
||||
@@ -96,6 +96,8 @@ class AdminStatusesControllerCore extends AdminController
|
||||
)
|
||||
);
|
||||
|
||||
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
|
||||
|
||||
parent::__construct();
|
||||
}
|
||||
|
||||
@@ -104,8 +106,6 @@ class AdminStatusesControllerCore extends AdminController
|
||||
$this->addRowAction('edit');
|
||||
$this->addRowAction('delete');
|
||||
|
||||
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
|
||||
|
||||
$list_orders_status = parent::renderList();
|
||||
|
||||
// Added new list
|
||||
|
||||
@@ -68,6 +68,8 @@ class AdminStoresControllerCore extends AdminController
|
||||
'active' => array('title' => $this->l('Enabled'), 'align' => 'center', 'active' => 'status', 'type' => 'bool', 'orderby' => false)
|
||||
);
|
||||
|
||||
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
|
||||
|
||||
$this->options = array(
|
||||
'general' => array(
|
||||
'title' => $this->l('Parameters'),
|
||||
@@ -117,8 +119,6 @@ class AdminStoresControllerCore extends AdminController
|
||||
$this->addRowAction('edit');
|
||||
$this->addRowAction('delete');
|
||||
|
||||
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
|
||||
|
||||
$this->_select = 'cl.`name` country, st.`name` state';
|
||||
$this->_join = '
|
||||
LEFT JOIN `'._DB_PREFIX_.'country_lang` cl
|
||||
|
||||
@@ -55,6 +55,8 @@ class AdminTagsControllerCore extends AdminController
|
||||
)
|
||||
);
|
||||
|
||||
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
|
||||
|
||||
parent::__construct();
|
||||
}
|
||||
|
||||
@@ -63,11 +65,6 @@ class AdminTagsControllerCore extends AdminController
|
||||
$this->addRowAction('edit');
|
||||
$this->addRowAction('delete');
|
||||
|
||||
$this->bulk_actions = array(
|
||||
'delete' => array('text' => $this->l('Delete selected'),
|
||||
'confirm' => $this->l('Delete selected items?'))
|
||||
);
|
||||
|
||||
$this->_select = 'l.name as lang, COUNT(pt.id_product) as products';
|
||||
$this->_join = '
|
||||
LEFT JOIN `'._DB_PREFIX_.'product_tag` pt
|
||||
|
||||
@@ -59,6 +59,8 @@ class AdminTaxRulesGroupControllerCore extends AdminController
|
||||
)
|
||||
);
|
||||
|
||||
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
|
||||
|
||||
parent::__construct();
|
||||
}
|
||||
|
||||
@@ -67,8 +69,6 @@ class AdminTaxRulesGroupControllerCore extends AdminController
|
||||
$this->addRowAction('edit');
|
||||
$this->addRowAction('delete');
|
||||
|
||||
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
|
||||
|
||||
return parent::renderList();
|
||||
}
|
||||
|
||||
@@ -111,8 +111,6 @@ class AdminTaxRulesGroupControllerCore extends AdminController
|
||||
$this->addRowAction('edit');
|
||||
$this->addRowAction('delete');
|
||||
|
||||
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
|
||||
|
||||
$this->_select = '
|
||||
c.`name` AS country_name,
|
||||
s.`name` AS state_name,
|
||||
|
||||
@@ -55,6 +55,8 @@ class AdminZonesControllerCore extends AdminController
|
||||
)
|
||||
);
|
||||
|
||||
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
|
||||
|
||||
parent::__construct();
|
||||
}
|
||||
|
||||
@@ -63,8 +65,6 @@ class AdminZonesControllerCore extends AdminController
|
||||
$this->addRowAction('edit');
|
||||
$this->addRowAction('delete');
|
||||
|
||||
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
|
||||
|
||||
return parent::renderList();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user