// Improve backoffice order

This commit is contained in:
rGaillard
2011-12-29 14:35:03 +00:00
parent e66bc7f4f8
commit e7264d40cf
5 changed files with 23 additions and 12 deletions
+8 -5
View File
@@ -155,6 +155,8 @@ class AdminControllerCore extends Controller
/** @var array list of row ids associated with a given action for witch this action have to not be available */
protected $list_skip_actions = array();
/* @var boolean don't show header & footer */
protected $lite_display = false;
/** @var bool boolean List content lines are clickable if true */
protected $list_no_link = false;
@@ -968,11 +970,11 @@ class AdminControllerCore extends Controller
$back = Tools::safeOutput(Tools::getValue('back', ''));
if (empty($back))
$back = self::$currentIndex.'&token='.$this->token;
$this->toolbar_btn['back'] = array(
'href' => $back,
'desc' => $this->l('Back to list')
);
if (!$this->lite_display)
$this->toolbar_btn['back'] = array(
'href' => $back,
'desc' => $this->l('Back to list')
);
break;
case 'options':
$this->toolbar_btn['save'] = array(
@@ -1696,6 +1698,7 @@ class AdminControllerCore extends Controller
$this->display_header = false;
$this->display_footer = false;
$this->content_only = false;
$this->lite_display = true;
}
// Change shop context ?
+2 -2
View File
@@ -120,14 +120,13 @@ class ShopCore extends ObjectModel
public function __construct($id = null, $id_lang = null, $id_shop = null)
{
parent::__construct($id, $id_lang, $id_shop);
if ($this->id)
{
$sql = 'SELECT su.physical_uri, su.virtual_uri, su.domain, su.domain_ssl, t.name, t.directory
FROM '._DB_PREFIX_.'shop s
LEFT JOIN '._DB_PREFIX_.'shop_url su ON (s.id_shop = su.id_shop)
LEFT JOIN '._DB_PREFIX_.'theme t ON (t.id_theme = s.id_theme)
WHERE s.id_shop = '.$this->id.'
WHERE s.id_shop = '.(int)$this->id.'
AND s.active = 1
AND s.deleted = 0
AND su.main = 1';
@@ -226,6 +225,7 @@ class ShopCore extends ObjectModel
*/
public static function initialize()
{
// Get list of excluded uri
$dirname = dirname(__FILE__);
$directories = scandir($dirname.'/../');