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

[*] BO : #PSFV-94 - added AdminShippingController

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9727 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
tDidierjean
2011-10-28 15:46:01 +00:00
parent 4e0a3102a3
commit bb01a8debc
6 changed files with 331 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/AdminController.php
+3 -2
View File
@@ -244,6 +244,8 @@ class AdminControllerCore extends Controller
// Get the name of the folder containing the custom tpl files
$this->tpl_folder = strtolower($controller[5]).substr($controller, 6);
$this->tpl_folder = Tools::toUnderscoreCase($this->tpl_folder).'/';
$this->context->currency = new Currency(Configuration::get('PS_CURRENCY_DEFAULT'));
}
/**
@@ -726,7 +728,7 @@ class AdminControllerCore extends Controller
break;
default: // list
$this->toolbar_btn['new'] = array(
'href' => self::$currentIndex.'&add'.$this->table.'&token='.$this->token,
'href' => self::$currentIndex.'&add'.$this->table.'&token='.$this->token,
'desc' => $this->l('Add new')
);
}
@@ -1329,7 +1331,6 @@ class AdminControllerCore extends Controller
$this->display_footer = false;
$this->content_only = true;
}
$this->context->currency = new Currency(Configuration::get('PS_CURRENCY_DEFAULT'));
// Change shop context ?
if (Shop::isFeatureActive() && Tools::getValue('setShopContext') !== false)