//Added bulk action in AdminShopUrlController and fixed norms

This commit is contained in:
lLefevre committed 2011-10-04 15:45:47 +00:00
1 parent 8165dc91f8
commit bfda79aef0
3 files changed
+30 -20

No files matched your search

+5 -1
View File
@@ -23,6 +23,9 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*} *}
{if isset($tab_form)}
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
function fillShopUrl() function fillShopUrl()
@@ -71,7 +74,6 @@
//]]> //]]>
</script> </script>
{if isset($tab_form)}
<form action="{$tab_form['current']}&submitAdd{$tab_form['table']}=1&token={$tab_form['token']}" method="post"> <form action="{$tab_form['current']}&submitAdd{$tab_form['table']}=1&token={$tab_form['token']}" method="post">
{if $tab_form['id']}<input type="hidden" name="id_'.$this->table.'" value="'.$obj->id.'" />{/if} {if $tab_form['id']}<input type="hidden" name="id_'.$this->table.'" value="'.$obj->id.'" />{/if}
<fieldset><legend>{l s ='Shop Url'}</legend> <fieldset><legend>{l s ='Shop Url'}</legend>
@@ -133,5 +135,7 @@
<div class="small"><sup>*</sup> {l s ='Required field'}</div> <div class="small"><sup>*</sup> {l s ='Required field'}</div>
</fieldset> </fieldset>
</form> </form>
{/if} {/if}
{$content} {$content}
+2 -3
View File
@@ -35,9 +35,8 @@ class ShopUrlCore extends ObjectModel
public $main; public $main;
public $active; public $active;
private static $main_domain = NULL; private static $main_domain = null;
private static $main_domain_ssl = NULL; private static $main_domain_ssl = null;
protected $fieldsRequired = array('domain', 'id_shop'); protected $fieldsRequired = array('domain', 'id_shop');
protected $fieldsSize = array('domain' => 255, 'physical_uri' => 64, 'virtual_uri' => 64); protected $fieldsSize = array('domain' => 255, 'physical_uri' => 64, 'virtual_uri' => 64);
+23 -16
View File
@@ -35,6 +35,7 @@ class AdminShopUrlControllerCore extends AdminController
$this->edit = true; $this->edit = true;
$this->delete = true; $this->delete = true;
$this->requiredDatabase = true; $this->requiredDatabase = true;
$this->_listSkipDelete = array(1);
$this->context = Context::getContext(); $this->context = Context::getContext();
@@ -43,7 +44,8 @@ class AdminShopUrlControllerCore extends AdminController
$this->_select = 's.name AS shop_name, CONCAT(a.physical_uri, a.virtual_uri) AS uri'; $this->_select = 's.name AS shop_name, CONCAT(a.physical_uri, a.virtual_uri) AS uri';
$this->_join = 'LEFT JOIN `'._DB_PREFIX_.'shop` s ON (s.id_shop = a.id_shop)'; $this->_join = 'LEFT JOIN `'._DB_PREFIX_.'shop` s ON (s.id_shop = a.id_shop)';
$this->_listSkipDelete = array(1);
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
$this->fieldsDisplay = array( $this->fieldsDisplay = array(
'id_shop_url' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25), 'id_shop_url' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
@@ -62,6 +64,7 @@ class AdminShopUrlControllerCore extends AdminController
public function postProcess() public function postProcess()
{ {
info($this->action);
$token = Tools::getValue('token') ? Tools::getValue('token') : $this->token; $token = Tools::getValue('token') ? Tools::getValue('token') : $this->token;
if (Tools::isSubmit('submitAdd'.$this->table)) if (Tools::isSubmit('submitAdd'.$this->table))
{ {
@@ -104,30 +107,26 @@ class AdminShopUrlControllerCore extends AdminController
return parent::postProcess(); return parent::postProcess();
} }
protected function afterUpdate($object)
{
if (Tools::getValue('main'))
$object->setMain();
}
public function displayForm($isMainTab = true) public function displayForm($isMainTab = true)
{ {
$this->content = parent::displayForm($isMainTab); $this->content = parent::displayForm($isMainTab);
if (!($obj = $this->loadObject(true))) if (!($obj = $this->loadObject(true)))
return; return;
$currentShop = Shop::initialize(); $current_shop = Shop::initialize();
$listShopWithUrl = array(); $list_shop_with_url = array();
foreach (Shop::getShops(false, null, true) as $id) foreach (Shop::getShops(false, null, true) as $id)
$listShopWithUrl[$id] = (bool)count(ShopUrl::getShopUrls($id)); $list_shop_with_url[$id] = (bool)count(ShopUrl::getShopUrls($id));
$jsShopUrl = Tools::jsonEncode($listShopWithUrl);
$domain = Validate::isLoadedObject($obj) ? $this->getFieldValue($obj, 'domain') : $currentShop->domain; $js_shop_url = Tools::jsonEncode($list_shop_with_url);
$domain_ssl = Validate::isLoadedObject($obj) ? $this->getFieldValue($obj, 'domain_ssl') : $currentShop->domain_ssl;
$physical_uri = Validate::isLoadedObject($obj) ? $this->getFieldValue($obj, 'physical_uri') : $currentShop->physical_uri;
$this->context->smarty->assign('tab_form', array('current' => self::$currentIndex, $domain = Validate::isLoadedObject($obj) ? $this->getFieldValue($obj, 'domain') : $current_shop->domain;
$domain_ssl = Validate::isLoadedObject($obj) ? $this->getFieldValue($obj, 'domain_ssl') : $current_shop->domain_ssl;
$physical_uri = Validate::isLoadedObject($obj) ? $this->getFieldValue($obj, 'physical_uri') : $current_shop->physical_uri;
$this->context->smarty->assign('tab_form', array(
'current' => self::$currentIndex,
'table' => $this->table, 'table' => $this->table,
'token' => $this->token, 'token' => $this->token,
'id' => $obj->id, 'id' => $obj->id,
@@ -139,13 +138,21 @@ class AdminShopUrlControllerCore extends AdminController
'id_shop' => $obj->id_shop, 'id_shop' => $obj->id_shop,
'main' => $this->getFieldValue($obj, 'main') ? true : false, 'main' => $this->getFieldValue($obj, 'main') ? true : false,
'active' => $this->getFieldValue($obj, 'active') ? true : false, 'active' => $this->getFieldValue($obj, 'active') ? true : false,
'jsShopUrl' => $jsShopUrl)); 'jsShopUrl' => $js_shop_url
));
}
protected function afterUpdate($object)
{
if (Tools::getValue('main'))
$object->setMain();
} }
public function initContent() public function initContent()
{ {
if ($this->display != 'edit') if ($this->display != 'edit')
$this->display = 'list'; $this->display = 'list';
parent::initContent(); parent::initContent();
} }